fe / yohobuywap-node · Commits

Go to a project

Authored by 陈峰
Commit 204de5d622b599185c53f6f56d2cc56dd8661da4 1 parent 0516819f

improt

Inline Side-by-side
Showing 21 changed files with 98 additions and 100 deletions
let Vue = require('vue');
let app = require('vues/activity/demo/index.vue').default;
import Vue from 'vue';
import app from 'vues/activity/demo/index.vue';
new Vue({
el: '#app',
... ...
import GoodsShowYasRpter from 'js/common/goods-show-yas-rpter';
const lazyLoad = require('yoho-jquery-lazyload');
const yoho = require('js/yoho-app');
... ... @@ -6,8 +7,6 @@ lazyLoad($('img.lazy'));
// 商品曝光事件上报
if (yoho.isApp) {
let GoodsShowYasRpter = require('js/common/goods-show-yas-rpter').default;
new GoodsShowYasRpter({
goodsContainer: $('#goods-container'),
goodsSelectorStr: '.good-info'
... ...
... ... @@ -34,8 +34,8 @@ let $addressForm = $('.edit-address'),
let $usernameInput = $addressForm.find('[name="consignee"]');
let Vue = require('vue');
let vueAddressAct = require('vues/home/address/address-act.vue').default;
import Vue from 'vue';
import vueAddressAct from 'vues/home/address/address-act.vue';
let addressVact = new Vue({
el: '#vAddressAct',
... ...
... ... @@ -3,7 +3,7 @@
* @author: wsl<shuiling.wang@yoho.cn>
* @date: 2016/08/17
*/
import GoodsShowYasRpter from 'js/common/goods-show-yas-rpter';
let $ = require('yoho-jquery'),
cookie = require('yoho-cookie'),
Swiper = require('yoho-swiper'),
... ... @@ -226,8 +226,6 @@ $(function() {
// 商品曝光事件上报
if (yoho.isApp) {
let GoodsShowYasRpter = require('js/common/goods-show-yas-rpter').default;
new GoodsShowYasRpter({
goodsContainer: $('#goods-list'),
goodsSelectorStr: '.good-info'
... ...
import Vue from 'vue';
require('scss/common.scss');
require('scss/home/order-address-modify.page.scss');
const $ = require('yoho-jquery');
const Vue = require('vue');
const tip = require('js/plugin/tip');
const stringHandle = require('js/common/helpers/stringHandle');
... ... @@ -14,7 +14,8 @@ let $province = $('input[name=province]');
let $provinceCode = $('input[name=provinceCode]');
let $area = $('#area');
let $usernameInput = $areaForm.find('input[name=username]');
let vueAddressAct = require('vues/home/address/address-act.vue').default;
import vueAddressAct from 'vues/home/address/address-act.vue';
let addressVact = new Vue({
el: '#vAddressAct',
... ...
const Vue = require('vue');
import Vue from 'vue';
import exchange from 'vues/home/exchange/exchange.vue';
const lazyload = require('vue-lazyload');
const exchange = require('vues/home/exchange/exchange.vue').default;
const bus = require('js/plugin/vue-bus');
const yohoApp = require('js/yoho-app');
... ...
const Vue = require('vue');
const Logistics = require('vues/home/refund/logistics.vue').default;
const LogisticsCompany = require('vues/home/refund/logistics-company.vue').default;
import Vue from 'vue';
import Logistics from 'vues/home/refund/logistics.vue';
import LogisticsCompany from 'vues/home/refund/logistics-company.vue';
const bus = require('js/plugin/vue-bus');
new Vue({
... ...
... ... @@ -5,8 +5,8 @@
*/
'use strict';
require('scss/home/fraud.scss');
const Vue = require('vue');
const refundOrder = require('vues/home/refund/refund-order.vue').default;
import Vue from 'vue';
import refundOrder from 'vues/home/refund/refund-order.vue';
const infiniteScroll = require('vue-infinite-scroll');
Vue.use(infiniteScroll);
... ...
const Vue = require('vue');
const Status = require('vues/home/refund/refund-status.vue').default;
import Vue from 'vue';
import Status from 'vues/home/refund/refund-status.vue';
const yohoApp = require('js/yoho-app');
require('js/plugin/vue-filter')(Vue);
... ...
const Vue = require('vue');
import Vue from 'vue';
import refund from 'vues/home/refund/refund.vue';
const lazyload = require('vue-lazyload');
const bus = require('js/plugin/vue-bus');
const refund = require('vues/home/refund/refund.vue').default;
const vueFilter = require('js/plugin/vue-filter');
const yohoApp = require('js/yoho-app');
... ...
const Vue = require('vue');
import Vue from 'vue';
let vue = new Vue();
... ...
... ... @@ -3,6 +3,7 @@
* author: 陈峰<feng.chen@yoho.cn>
* date: 2016/09/08
*/
import GoodsShowYasRpter from 'js/common/goods-show-yas-rpter';
require('js/common');
require('js/common/share');
let yoho = require('js/yoho-app');
... ... @@ -479,7 +480,6 @@ require('./seckill/goods-list');
// 商品曝光事件上报
if (yoho.isApp) {
let GoodsShowYasRpter = require('js/common/goods-show-yas-rpter').default;
new GoodsShowYasRpter({
goodsContainer: $('#container'),
... ...
... ... @@ -12,6 +12,69 @@
color: #444;
}
/* 优先级高不能后置 */
.block {
background: #fff;
margin: 20px 0;
padding: 30px 20px;
border-top: 1px solid #e0e0e0;
border-bottom: 1px solid #e0e0e0;
input,
textarea {
box-sizing: border-box;
margin: 20px 0;
padding: 0 12px;
width: 100%;
height: 72px;
color: #444;
background: #efefef;
font-size: 24px;
line-height: 1;
outline: 0;
border: 0;
border-radius: 4px;
}
textarea {
padding: 12px;
height: auto;
resize: none;
}
&.mt0 {
margin-top: 0;
}
&.more-jit {
padding-top: 0;
padding-bottom: 0;
margin-bottom: -0.5rem;
border-bottom: none;
a {
display: inline-block;
width: 100%;
}
}
.more-jit {
height: 88px;
line-height: 88px;
position: relative;
span {
font-size: 34px;
color: #444;
}
.iconfont {
position: absolute;
right: 0;
}
}
}
.price-cost {
span {
color: #f00;
... ... @@ -603,68 +666,6 @@
}
}
.block {
background: #fff;
margin: 20px 0;
padding: 30px 20px;
border-top: 1px solid #e0e0e0;
border-bottom: 1px solid #e0e0e0;
input,
textarea {
box-sizing: border-box;
margin: 20px 0;
padding: 0 12px;
width: 100%;
height: 72px;
color: #444;
background: #efefef;
font-size: 24px;
line-height: 1;
outline: 0;
border: 0;
border-radius: 4px;
}
textarea {
padding: 12px;
height: auto;
resize: none;
}
&.mt0 {
margin-top: 0;
}
&.more-jit {
padding-top: 0;
padding-bottom: 0;
margin-bottom: -0.5rem;
border-bottom: none;
a {
display: inline-block;
width: 100%;
}
}
.more-jit {
height: 88px;
line-height: 88px;
position: relative;
span {
font-size: 34px;
color: #444;
}
.iconfont {
position: absolute;
right: 0;
}
}
}
#invoice {
border-top: 1px solid #f7f7f7;
... ...
... ... @@ -49,11 +49,11 @@
</template>
<script>
import addressAct from 'vues/home/address/address-act.vue';
const $ = require('yoho-jquery');
const tip = require('js/plugin/tip');
const bus = require('js/plugin/vue-bus');
const modal = require('js/plugin/modal2');
const addressAct = require('vues/home/address/address-act.vue').default;
module.exports = {
props: ['address'],
... ...
... ... @@ -29,6 +29,8 @@
</template>
<script>
import productList from 'vues/home/return/list.vue';
import addressList from 'vues/home/address/list.vue';
const $ = require('yoho-jquery');
const qs = require('yoho-qs');
const Modal = require('js/plugin/modal2');
... ... @@ -37,9 +39,7 @@
const loading = require('js/plugin/loading');
const chosePanel = require('js/common/chose-panel-new');
const productList = require('vues/home/return/list.vue').default;
const reasonConfig = require('vues/home/return/reason');
const addressList = require('vues/home/address/list.vue').default;
const specialRid = [0, 4, 6, 8];
... ...
... ... @@ -19,8 +19,8 @@
* 2. 更换产品 款式
* 3. 换货 原因
*/
const product = require('vues/home/return/item.vue').default;
const reason = require('vues/home/return/reason.vue').default;
import product from 'vues/home/return/item.vue';
import reason from 'vues/home/return/reason.vue';
const bus = require('js/plugin/vue-bus');
module.exports = {
... ...
... ... @@ -14,8 +14,8 @@
</template>
<script>
import indexList from 'vues/components/tools/index-list.vue';
const $ = require('yoho-jquery');
const indexList = require('vues/components/tools/index-list.vue').default;
const bus = require('js/plugin/vue-bus');
module.exports = {
... ...
... ... @@ -8,8 +8,8 @@
</template>
<script>
const product = require('vues/home/return/item.vue').default;
const reason = require('vues/home/return/reason.vue').default;
import product from 'vues/home/return/item.vue';
import reason from 'vues/home/return/reason.vue';
module.exports = {
props: ['product', 'refundData'],
... ...
... ... @@ -36,11 +36,11 @@
</template>
<script>
import productList from 'vues/home/return/list.vue';
const $ = require('yoho-jquery');
const qs = require('yoho-qs');
const modal = require('js/plugin/modal2');
const returnUtil = require('js/plugin/util');
const productList = require('vues/home/return/list.vue').default;
const reasonConfig = require('vues/home/return/reason');
const bus = require('js/plugin/vue-bus');
const loading = require('js/plugin/loading');
... ...
... ... @@ -17,9 +17,9 @@
</template>
<script>
const pruduct = require('vues/home/return/item.vue').default;
const exchangeItem = require('vues/home/exchange/item.vue').default;
const refundItem = require('vues/home/refund/product.vue').default;
import pruduct from 'vues/home/return/item.vue';
import exchangeItem from 'vues/home/exchange/item.vue';
import refundItem from 'vues/home/refund/product.vue';
module.exports = {
props: ['list', 'data', 'type'],
... ...
... ... @@ -55,7 +55,7 @@
</template>
<script>
const upload = require('vues/components/tools/upload.vue').default;
import upload from 'vues/components/tools/upload.vue';
const util = require('js/plugin/util');
const tip = require('js/plugin/tip');
const reasonConfig = require('vues/home/return/reason');
... ...