qianggou
/
uniapp
forked from zhongyuanhaiju/uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化：处理主包过大的问题；将秒杀相关内容移入rush包中，并且将主包的order内容移入rush包中。将部分仅某个分包使用的组件全部放入对应的分包中

This commit is contained in:
wuhui_zzw 2023-03-20 19:19:58 +08:00
parent 067f0cb3d1
commit 16f74331d4
537 changed files with 432 additions and 15723 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/common-payment/payment.js
View File

@ -738,7 +738,7 @@ export default {
* 支付弹窗关闭 * 支付弹窗关闭
*/ */
payClose(){ payClose(){
this.$util.redirectTo('/pages/order/detail', {order_id: this.$refs.choosePaymentPopup.payInfo.order_id}, 'redirectTo'); this.$util.redirectTo('/pages_rush/order/detail', {order_id: this.$refs.choosePaymentPopup.payInfo.order_id}, 'redirectTo');
}, },
/** /**
* 选择优惠券 * 选择优惠券

2
components/diy-components/diy-category.vue
View File

@ -457,7 +457,7 @@ export default {
cart_ids: cartIds.toString() cart_ids: cartIds.toString()
}, },
success: () => { success: () => {
this.$util.redirectTo('/pages/order/payment'); this.$util.redirectTo('/pages_rush/order/payment');
this.isSub = false; this.isSub = false;
} }
}); });

2
components/diy-components/diy-many-goods-list.vue
View File

@ -76,7 +76,7 @@
<view class="price-item">采购价:<text class="purchase_price">￥{{ item.price }}</text></view> <view class="price-item">采购价:<text class="purchase_price">￥{{ item.price }}</text></view>
</view> </view>
<view class="buy-button"> <view class="buy-button">
<view class="buy-btn" @click="$util.redirectTo('/pages_promotion/futures/details', { id: item.id }, 'redirectTo');">前去采购</view> <view class="buy-btn" @click="$util.redirectTo('/pages_rush/futures/details', { id: item.id }, 'redirectTo');">前去采购</view>
</view> </view>
</view> </view>
</view> </view>

8
components/diy-components/diy-member-my-order.vue
View File

@ -2,7 +2,7 @@
<view class="common-wrap" :style="warpCss"> <view class="common-wrap" :style="warpCss">
<view class="order-wrap"> <view class="order-wrap">
<view class="status-wrap"> <view class="status-wrap">
<view class="item-wrap" @click="redirect('/pages/order/list?status=waitpay')"> <view class="item-wrap" @click="redirect('/pages_rush/order/list?status=waitpay')">
<view class="icon-block"> <view class="icon-block">
<template v-if="value.style == 3"> <template v-if="value.style == 3">
<image :src="$util.img('public/uniapp/member/order/wait_pay.png')" mode="widthFix"></image> <image :src="$util.img('public/uniapp/member/order/wait_pay.png')" mode="widthFix"></image>
@ -15,7 +15,7 @@
</view> </view>
<view class="title">待付款</view> <view class="title">待付款</view>
</view> </view>
<view class="item-wrap" @click="redirect('/pages/order/list?status=waitsend')"> <view class="item-wrap" @click="redirect('/pages_rush/order/list?status=waitsend')">
<view class="icon-block"> <view class="icon-block">
<template v-if="value.style == 3"> <template v-if="value.style == 3">
<image :src="$util.img('public/uniapp/member/order/wait_send.png')" mode="widthFix"></image> <image :src="$util.img('public/uniapp/member/order/wait_send.png')" mode="widthFix"></image>
@ -28,7 +28,7 @@
</view> </view>
<view class="title">待发货</view> <view class="title">待发货</view>
</view> </view>
<view class="item-wrap" @click="redirect('/pages/order/list?status=waitconfirm')"> <view class="item-wrap" @click="redirect('/pages_rush/order/list?status=waitconfirm')">
<view class="icon-block"> <view class="icon-block">
<template v-if="value.style == 3"> <template v-if="value.style == 3">
<image :src="$util.img('public/uniapp/member/order/wait_confirm.png')" mode="widthFix"></image> <image :src="$util.img('public/uniapp/member/order/wait_confirm.png')" mode="widthFix"></image>
@ -45,7 +45,7 @@
</view> </view>
<view class="title">待收货</view> <view class="title">待收货</view>
</view> </view>
<view class="item-wrap" @click="redirect('/pages/order/list?status=wait_use')"> <view class="item-wrap" @click="redirect('/pages_rush/order/list?status=wait_use')">
<view class="icon-block"> <view class="icon-block">
<template v-if="value.style == 3"> <template v-if="value.style == 3">
<image :src="$util.img('public/uniapp/member/order/wait_use.png')" mode="widthFix"></image> <image :src="$util.img('public/uniapp/member/order/wait_use.png')" mode="widthFix"></image>

2
components/farm-goods-detail-view/detail.js
View File

@ -414,7 +414,7 @@ export default {
}, },
showImg(e) { showImg(e) {
//拿到图片的路径里面的内容放在我们数组中 //拿到图片的路径里面的内容放在我们数组中
let contentimg = e.target.dataset.nodes; let contentimg = e.target.dataset.nodes || e.currentTarget.dataset.nodes;
let arrImg = []; let arrImg = [];
for (var i = 0; i < contentimg.length; i++) { for (var i = 0; i < contentimg.length; i++) {
var img = contentimg[i].children; var img = contentimg[i].children;

2
components/goods-detail-view/detail.js
View File

@ -498,7 +498,7 @@ export default {
}, },
showImg(e) { showImg(e) {
//拿到图片的路径里面的内容放在我们数组中 //拿到图片的路径里面的内容放在我们数组中
let contentimg = e.target.dataset.nodes; let contentimg = e.target.dataset.nodes || e.currentTarget.dataset.nodes;
let arrImg = []; let arrImg = [];
for (var i = 0; i < contentimg.length; i++) { for (var i = 0; i < contentimg.length; i++) {
var img = contentimg[i].children; var img = contentimg[i].children;

2
components/ns-goods-sku/ns-goods-sku.vue
View File

@ -1233,7 +1233,7 @@ export default {
key: 'orderCreateData', key: 'orderCreateData',
data: data, data: data,
success: () => { success: () => {
this.$util.redirectTo('/pages/order/payment'); this.$util.redirectTo('/pages_rush/order/payment');
this.btnSwitch = false; this.btnSwitch = false;
} }
}); });

4
manifest.json
View File

@ -1,5 +1,5 @@
{ {
"name" : "单商户V4", "name" : "山野乡涧",
"appid" : "__UNI__E00B9A8", "appid" : "__UNI__E00B9A8",
"description" : "", "description" : "",
"versionName" : "5.1.2", "versionName" : "5.1.2",
@ -58,7 +58,7 @@
"quickapp" : {}, "quickapp" : {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin" : { "mp-weixin" : {
"appid" : "wx886b46d12e1a234d", "appid" : "wx833c180138b65656",
"setting" : { "setting" : {
"urlCheck" : false, "urlCheck" : false,
"postcss" : false, "postcss" : false,

427
pages.json
View File

@ -52,56 +52,6 @@
"navigationStyle": "custom", "navigationStyle": "custom",
"enablePullDownRefresh": true "enablePullDownRefresh": true
} }
},
//******************订单模块（12）******************
{
"path": "pages/order/payment",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/order/list",
"style": {
// #ifdef H5
"navigationStyle": "custom"
// #endif
}
},
{
"path": "pages/order/detail",
"style": {
// #ifdef H5
"navigationStyle": "custom"
// #endif
}
},
// 本地配送订单详情
{
"path": "pages/order/detail_local_delivery",
"style": {
// #ifdef H5
"navigationStyle": "custom"
// #endif
}
},
// 自提订单详情
{
"path": "pages/order/detail_pickup",
"style": {
// #ifdef H5
"navigationStyle": "custom"
// #endif
}
},
//积分订单详情
{
"path": "pages/order/detail_point",
"style": {
// #ifdef H5
"navigationStyle": "custom"
// #endif
}
} }
], ],
"subPackages": [ "subPackages": [
@ -956,126 +906,6 @@
// #endif // #endif
"navigationBarTitleText": "分销商升级申请" "navigationBarTitleText": "分销商升级申请"
} }
},
//****************** 文章 ******************
{
"path": "article/list",
"style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "文章"
}
},
{
"path": "article/record",
"style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "文章"
}
},
{
"path": "article/detail",
"style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "文章"
}
},
//****************** 交易市场 ******************
{
"path": "futures/list",
"style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "交易市场"
}
},
{
"path": "futures/seckill",
"style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "限时秒杀"
}
},
{
"path": "futures/details",
"style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "商品详情"
}
},
{
"path": "futures/my_shop",
"style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "我的小店"
}
},
{
"path": "futures/order",
"style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "我的订单"
}
},
{
"path": "futures/order_details",
"style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "订单详情"
}
},
{
"path": "futures/payment",
"style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "交易下单"
}
},
//****************** 通知消息 ******************
{
"path": "message/index",
"style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "消息中心"
}
},
{
"path": "message/list",
"style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "消息列表"
}
},
{
"path": "message/words",
"style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "留言反馈"
}
} }
] ]
}, },
@ -1692,87 +1522,198 @@
} }
} }
] ]
},
{
"root": "pages_rush",
"pages": [
//****************** 文章 ******************
{
"path": "article/list",
"style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "文章"
}
},
{
"path": "article/record",
"style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "文章"
}
},
{
"path": "article/detail",
"style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "文章"
}
},
//****************** 交易市场 ******************
{
"path": "futures/list",
"style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "交易市场"
}
},
{
"path": "futures/seckill",
"style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "限时秒杀"
}
},
{
"path": "futures/details",
"style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "商品详情"
}
},
{
"path": "futures/my_shop",
"style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "我的小店"
}
},
{
"path": "futures/order",
"style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "我的订单"
}
},
{
"path": "futures/order_details",
"style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "订单详情"
}
},
{
"path": "futures/payment",
"style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "交易下单"
}
},
//****************** 通知消息 ******************
{
"path": "message/index",
"style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "消息中心"
}
},
{
"path": "message/list",
"style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "消息列表"
}
},
{
"path": "message/words",
"style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "留言反馈"
}
},
//******************订单模块（12）******************
{
"path": "order/payment",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "order/list",
"style": {
// #ifdef H5
"navigationStyle": "custom"
// #endif
}
},
{
"path": "order/detail",
"style": {
// #ifdef H5
"navigationStyle": "custom"
// #endif
}
},
{
"path": "order/detail_local_delivery",
"style": {
// #ifdef H5
"navigationStyle": "custom"
// #endif
}
},
{
"path": "order/detail_pickup",
"style": {
// #ifdef H5
"navigationStyle": "custom"
// #endif
}
},
{
"path": "order/detail_point",
"style": {
// #ifdef H5
"navigationStyle": "custom"
// #endif
}
}
]
} }
], ],
"globalStyle": { "globalStyle": {
// #ifdef MP-WEIXIN
"usingComponents": {
"van-tabs": "/wxcomponents/@vant/weapp/tabs/index",
"van-tab": "/wxcomponents/@vant/weapp/tab/index",
"van-button": "/wxcomponents/@vant/weapp/button/index",
"van-cell": "/wxcomponents/@vant/weapp/cell/index",
"van-loading": "/wxcomponents/@vant/weapp/loading/index",
"van-popup": "/wxcomponents/@vant/weapp/popup/index",
"van-share-sheet": "/wxcomponents/@vant/weapp/share-sheet/index"
},
// #endif
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarTitleText": "", "navigationBarTitleText": "",
"navigationBarBackgroundColor": "#ffffff", "navigationBarBackgroundColor": "#ffffff",
"backgroundColor": "#F7f7f7", "backgroundColor": "#F7f7f7",
"backgroundColorTop": "#f7f7f7", "backgroundColorTop": "#f7f7f7",
"backgroundColorBottom": "#f7f7f7", "backgroundColorBottom": "#f7f7f7"
"usingComponents": {
// #ifdef MP-WEIXIN
"van-tabs": "/wxcomponents/@vant/weapp/tabs/index",
"van-tab": "/wxcomponents/@vant/weapp/tab/index",
"van-action-sheet": "/wxcomponents/@vant/weapp/action-sheet/index",
"van-area": "/wxcomponents/@vant/weapp/area/index",
"van-button": "/wxcomponents/@vant/weapp/button/index",
"van-calendar": "/wxcomponents/@vant/weapp/calendar/index",
"van-card": "/wxcomponents/@vant/weapp/card/index",
"van-cascader": "/wxcomponents/@vant/weapp/cascader/index",
"van-cell": "/wxcomponents/@vant/weapp/cell/index",
"van-cell-group": "/wxcomponents/@vant/weapp/cell-group/index",
"van-checkbox": "/wxcomponents/@vant/weapp/checkbox/index",
"van-checkbox-group": "/wxcomponents/@vant/weapp/checkbox-group/index",
"van-circle": "/wxcomponents/@vant/weapp/circle/index",
"van-col": "/wxcomponents/@vant/weapp/col/index",
"van-collapse": "/wxcomponents/@vant/weapp/collapse/index",
"van-collapse-item": "/wxcomponents/@vant/weapp/collapse-item/index",
"van-config-provider": "/wxcomponents/@vant/weapp/config-provider/index",
"van-count-down": "/wxcomponents/@vant/weapp/count-down/index",
"van-datetime-picker": "/wxcomponents/@vant/weapp/datetime-picker/index",
"van-dialog": "/wxcomponents/@vant/weapp/dialog/index",
"van-divider": "/wxcomponents/@vant/weapp/divider/index",
"van-dropdown-item": "/wxcomponents/@vant/weapp/dropdown-item/index",
"van-dropdown-menu": "/wxcomponents/@vant/weapp/dropdown-menu/index",
"van-empty": "/wxcomponents/@vant/weapp/empty/index",
"van-field": "/wxcomponents/@vant/weapp/field/index",
"van-goods-action": "/wxcomponents/@vant/weapp/goods-action/index",
"van-goods-action-button": "/wxcomponents/@vant/weapp/goods-action-button/index",
"van-goods-action-icon": "/wxcomponents/@vant/weapp/goods-action-icon/index",
"van-grid": "/wxcomponents/@vant/weapp/grid/index",
"van-grid-item": "/wxcomponents/@vant/weapp/grid-item/index",
"van-icon": "/wxcomponents/@vant/weapp/icon/index",
"van-image": "/wxcomponents/@vant/weapp/image/index",
"van-index-anchor": "/wxcomponents/@vant/weapp/index-anchor/index",
"van-index-bar": "/wxcomponents/@vant/weapp/index-bar/index",
"van-info": "/wxcomponents/@vant/weapp/info/index",
"van-loading": "/wxcomponents/@vant/weapp/loading/index",
"van-nav-bar": "/wxcomponents/@vant/weapp/nav-bar/index",
"van-notice-bar": "/wxcomponents/@vant/weapp/notice-bar/index",
"van-notify": "/wxcomponents/@vant/weapp/notify/index",
"van-overlay": "/wxcomponents/@vant/weapp/overlay/index",
"van-panel": "/wxcomponents/@vant/weapp/panel/index",
"van-picker": "/wxcomponents/@vant/weapp/picker/index",
"van-picker-column": "/wxcomponents/@vant/weapp/picker-column/index",
"van-popup": "/wxcomponents/@vant/weapp/popup/index",
"van-progress": "/wxcomponents/@vant/weapp/progress/index",
"van-radio": "/wxcomponents/@vant/weapp/radio/index",
"van-radio-group": "/wxcomponents/@vant/weapp/radio-group/index",
"van-rate": "/wxcomponents/@vant/weapp/rate/index",
"van-row": "/wxcomponents/@vant/weapp/row/index",
"van-search": "/wxcomponents/@vant/weapp/search/index",
"van-share-sheet": "/wxcomponents/@vant/weapp/share-sheet/index",
"van-sidebar": "/wxcomponents/@vant/weapp/sidebar/index",
"van-sidebar-item": "/wxcomponents/@vant/weapp/sidebar-item/index",
"van-skeleton": "/wxcomponents/@vant/weapp/skeleton/index",
"van-slider": "/wxcomponents/@vant/weapp/slider/index",
"van-stepper": "/wxcomponents/@vant/weapp/stepper/index",
"van-steps": "/wxcomponents/@vant/weapp/steps/index",
"van-sticky": "/wxcomponents/@vant/weapp/sticky/index",
"van-submit-bar": "/wxcomponents/@vant/weapp/submit-bar/index",
"van-swipe-cell": "/wxcomponents/@vant/weapp/swipe-cell/index",
"van-switch": "/wxcomponents/@vant/weapp/switch/index",
"van-tabbar": "/wxcomponents/@vant/weapp/tabbar/index",
"van-tabbar-item": "/wxcomponents/@vant/weapp/tabbar-item/index",
"van-tag": "/wxcomponents/@vant/weapp/tag/index",
"van-toast": "/wxcomponents/@vant/weapp/toast/index",
"van-transition": "/wxcomponents/@vant/weapp/transition/index",
"van-tree-select": "/wxcomponents/@vant/weapp/tree-select/index",
"van-uploader": "/wxcomponents/@vant/weapp/uploader/index"
// #endif
}
}, },
"tabBar": { "tabBar": {
// #ifdef H5 // #ifdef H5

2
pages/goods/public/js/cart.js
View File

@ -351,7 +351,7 @@ export default {
cart_ids: cart_ids.toString() cart_ids: cart_ids.toString()
}, },
success: () => { success: () => {
this.$util.redirectTo('/pages/order/payment'); this.$util.redirectTo('/pages_rush/order/payment');
this.isSub = false; this.isSub = false;
} }
}); });

8
pages_promotion/bargain/detail.vue
View File

@ -174,13 +174,13 @@
</block> </block>
<block v-if="launchInfo.status == 1"> <block v-if="launchInfo.status == 1">
<button class="btn" @click="buyNow" v-if="launchInfo.order_id == 0">立即支付</button> <button class="btn" @click="buyNow" v-if="launchInfo.order_id == 0">立即支付</button>
<button class="btn" v-if="launchInfo.order_id > 0" @click="$util.redirectTo('/pages/order/detail', { order_id: launchInfo.order_id })"> <button class="btn" v-if="launchInfo.order_id > 0" @click="$util.redirectTo('/pages_rush/order/detail', { order_id: launchInfo.order_id })">
查看订单 查看订单
</button> </button>
<button class="btn-vice" @click="$util.redirectTo('/pages/index/index')">低价拿更多商品</button> <button class="btn-vice" @click="$util.redirectTo('/pages/index/index')">低价拿更多商品</button>
</block> </block>
<block v-if="launchInfo.status == 2"> <block v-if="launchInfo.status == 2">
<button class="btn" v-if="launchInfo.order_id > 0" @click="$util.redirectTo('/pages/order/detail', { order_id: launchInfo.order_id })"> <button class="btn" v-if="launchInfo.order_id > 0" @click="$util.redirectTo('/pages_rush/order/detail', { order_id: launchInfo.order_id })">
查看订单 查看订单
</button> </button>
<button class="btn" @click="$util.redirectTo('/pages/index/index')">低价拿更多商品</button> <button class="btn" @click="$util.redirectTo('/pages/index/index')">低价拿更多商品</button>
@ -197,7 +197,7 @@
</block> </block>
<block v-else> <block v-else>
<view class="flex-box success"> <view class="flex-box success">
<button class="btn" v-if="launchInfo.self && launchInfo.order_id > 0" @click="$util.redirectTo('/pages/order/detail', { order_id: launchInfo.order_id })"> <button class="btn" v-if="launchInfo.self && launchInfo.order_id > 0" @click="$util.redirectTo('/pages_rush/order/detail', { order_id: launchInfo.order_id })">
查看订单 查看订单
</button> </button>
<button class="btn-vice disabled">活动已结束</button> <button class="btn-vice disabled">活动已结束</button>
@ -445,7 +445,7 @@
</template> </template>
<script> <script>
import LTime from '@/components/l-time/l-time.vue'; import LTime from '@/pages_promotion/components/l-time/l-time.vue';
import uniPopup from '@/components/uni-popup/uni-popup.vue'; import uniPopup from '@/components/uni-popup/uni-popup.vue';
import goodsSku from '@/components/ns-goods-sku/ns-goods-sku.vue'; import goodsSku from '@/components/ns-goods-sku/ns-goods-sku.vue';
import nsLogin from '@/components/ns-login/ns-login.vue'; import nsLogin from '@/components/ns-login/ns-login.vue';

2
pages_promotion/blindbox/list.vue
View File

@ -50,7 +50,7 @@
</template> </template>
<script> <script>
import nsAdv from '@/components/ns-adv/ns-adv.vue'; import nsAdv from '@/pages_promotion/components/ns-adv/ns-adv.vue';
export default { export default {
components: { components: {
nsAdv nsAdv

2
pages_promotion/blindbox/my_prize.vue
View File

@ -183,7 +183,7 @@ export default {
}); });
}, },
look(e) { look(e) {
this.$util.redirectTo('/pages/order/list', { order_id: e.order_id }); this.$util.redirectTo('/pages_rush/order/list', { order_id: e.order_id });
} }
} }
}; };

2
pages_promotion/blindbox/public/js/payment.js
View File

@ -287,7 +287,7 @@ export default {
success: res => { success: res => {
uni.hideLoading(); uni.hideLoading();
if (res.code == 0) { if (res.code == 0) {
this.$util.redirectTo('/pages/order/list', {}, 'redirectTo'); this.$util.redirectTo('/pages_rush/order/list', {}, 'redirectTo');
} else { } else {
if(res.data == ""){ if(res.data == ""){
this.$util.showToast({ this.$util.showToast({

2
pages_promotion/cardservice/card/card_record.vue
View File

@ -87,7 +87,7 @@ export default {
}, },
toOrderDetail(item) { toOrderDetail(item) {
if(item.type == "order"){ if(item.type == "order"){
this.$util.redirectTo('/pages/order/detail', { this.$util.redirectTo('/pages_rush/order/detail', {
order_id: item.order_id order_id: item.order_id
}); });
} }

2
pages_promotion/cardservice/card/list.vue
View File

@ -37,7 +37,7 @@
</template> </template>
<script> <script>
import nsAdv from '@/components/ns-adv/ns-adv.vue'; import nsAdv from '@/pages_promotion/components/ns-adv/ns-adv.vue';
export default { export default {
components: { components: {

2
pages_promotion/cardservice/service_goods/reserve_apply.vue
View File

@ -116,7 +116,7 @@
</template> </template>
<script> <script>
import yuyueDate from '@/components/yuyue-date/yuyue-date.vue'; import yuyueDate from '@/pages_promotion/components/yuyue-date/yuyue-date.vue';
import uniPopup from '@/components/uni-popup/uni-popup.vue'; import uniPopup from '@/components/uni-popup/uni-popup.vue';
export default { export default {
components: { components: {

2
pages_promotion/cardservice/service_goods/reserve_detail.vue
View File

@ -50,7 +50,7 @@
</template> </template>
<script> <script>
import yuyueDate from '@/components/yuyue-date/yuyue-date.vue'; import yuyueDate from '@/pages_promotion/components/yuyue-date/yuyue-date.vue';
export default { export default {
components: { components: {
yuyueDate yuyueDate

0
components/l-time/l-time.vue → pages_promotion/components/l-time/l-time.vue
View File

0
components/l-time/time.js → pages_promotion/components/l-time/time.js
View File

0
components/ns-adv/ns-adv.vue → pages_promotion/components/ns-adv/ns-adv.vue
View File

0
components/yuyue-date/yuyue-date.js → pages_promotion/components/yuyue-date/yuyue-date.js
View File

0
components/yuyue-date/yuyue-date.scss → pages_promotion/components/yuyue-date/yuyue-date.scss
View File

2
components/yuyue-date/yuyue-date.vue → pages_promotion/components/yuyue-date/yuyue-date.vue
View File

@ -402,5 +402,5 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import './yuyue-date.scss'; @import 'yuyue-date';
</style> </style>

2
pages_promotion/game/cards.vue
View File

@ -107,7 +107,7 @@
<script> <script>
import uniPopup from '@/components/uni-popup/uni-popup.vue'; import uniPopup from '@/components/uni-popup/uni-popup.vue';
import LTime from '@/components/l-time/l-time.vue'; import LTime from '@/pages_promotion/components/l-time/l-time.vue';
export default { export default {
components: { components: {

2
pages_promotion/game/smash_eggs.vue
View File

@ -124,7 +124,7 @@
<script> <script>
import uniPopup from '@/components/uni-popup/uni-popup.vue'; import uniPopup from '@/components/uni-popup/uni-popup.vue';
import LTime from '@/components/l-time/l-time.vue'; import LTime from '@/pages_promotion/components/l-time/l-time.vue';
export default { export default {
components: { components: {

2
pages_promotion/game/turntable.vue
View File

@ -114,7 +114,7 @@
<script> <script>
import uniPopup from '@/components/uni-popup/uni-popup.vue'; import uniPopup from '@/components/uni-popup/uni-popup.vue';
import LTime from '@/components/l-time/l-time.vue'; import LTime from '@/pages_promotion/components/l-time/l-time.vue';
export default { export default {
components: { components: {

2
pages_promotion/giftcard/card_info.vue
View File

@ -189,7 +189,7 @@ export default {
success: res => { success: res => {
if (res.confirm) { if (res.confirm) {
if(this.cardInfo.card_right_type == 'goods'){ if(this.cardInfo.card_right_type == 'goods'){
this.$util.redirectTo('/pages/order/detail',{'order_id':this.cardInfo.use_order_id}); this.$util.redirectTo('/pages_rush/order/detail',{'order_id':this.cardInfo.use_order_id});
return false; return false;
} }
if(this.cardInfo.card_right_type == 'balance'){ if(this.cardInfo.card_right_type == 'balance'){

8
pages_promotion/giftcard/card_use.vue
View File

@ -649,18 +649,18 @@ export default {
success: res => { success: res => {
if (res.code >= 0 && res.data && res.data.order_id > 0) { if (res.code >= 0 && res.data && res.data.order_id > 0) {
this.$util.redirectTo( this.$util.redirectTo(
'/pages/order/detail', '/pages_rush/order/detail',
{ {
order_id: res.data.order_id order_id: res.data.order_id
}, },
'redirectTo' 'redirectTo'
); );
} else { } else {
this.$util.redirectTo('/pages/order/list', {}, 'redirectTo'); this.$util.redirectTo('/pages_rush/order/list', {}, 'redirectTo');
} }
}, },
fail: res => { fail: res => {
this.$util.redirectTo('/pages/order/list', {}, 'redirectTo'); this.$util.redirectTo('/pages_rush/order/list', {}, 'redirectTo');
} }
}); });
} else { } else {
@ -1075,7 +1075,7 @@ export default {
* 支付弹窗关闭 * 支付弹窗关闭
*/ */
payClose() { payClose() {
this.$util.redirectTo('/pages/order/detail', { order_id: this.$refs.choosePaymentPopup.payInfo.order_id }, 'redirectTo'); this.$util.redirectTo('/pages_rush/order/detail', { order_id: this.$refs.choosePaymentPopup.payInfo.order_id }, 'redirectTo');
}, },
/** /**
* 选择优惠券 * 选择优惠券

2
pages_promotion/giftcard/index.vue
View File

@ -66,7 +66,7 @@
</template> </template>
<script> <script>
import nsAdv from '@/components/ns-adv/ns-adv.vue'; import nsAdv from '@/pages_promotion/components/ns-adv/ns-adv.vue';
// 获取系统状态栏的高度 // 获取系统状态栏的高度
let systemInfo = uni.getSystemInfoSync(); let systemInfo = uni.getSystemInfoSync();
let menuButtonInfo = {}; let menuButtonInfo = {};

2
pages_promotion/giftcard/member.vue
View File

@ -108,7 +108,7 @@
</template> </template>
<script> <script>
import nsAdv from '@/components/ns-adv/ns-adv.vue'; import nsAdv from '@/pages_promotion/components/ns-adv/ns-adv.vue';
export default { export default {
components: { components: {
nsAdv nsAdv

2
pages_promotion/pinfan/list.vue
View File

@ -83,7 +83,7 @@
<script> <script>
import uniTag from '@/components/uni-tag/uni-tag.vue'; import uniTag from '@/components/uni-tag/uni-tag.vue';
import nsAdv from '@/components/ns-adv/ns-adv.vue'; import nsAdv from '@/pages_promotion/components/ns-adv/ns-adv.vue';
export default { export default {
components: { components: {
uniTag, uniTag,

6
pages_promotion/pinfan/my_rebate.vue
View File

@ -203,11 +203,11 @@
if(delivery_type==''){ if(delivery_type==''){
this.$util.redirectTo('/pages_tool/order/detail_virtual', { order_id: id }); this.$util.redirectTo('/pages_tool/order/detail_virtual', { order_id: id });
}else if(delivery_type=='store'){ }else if(delivery_type=='store'){
this.$util.redirectTo('/pages/order/detail_pickup', {order_id: id}); this.$util.redirectTo('/pages_rush/order/detail_pickup', {order_id: id});
}else if(delivery_type=='local'){ }else if(delivery_type=='local'){
this.$util.redirectTo('/pages/order/detail_local_delivery', {order_id: id}); this.$util.redirectTo('/pages_rush/order/detail_local_delivery', {order_id: id});
}else if(delivery_type=='express'){ }else if(delivery_type=='express'){
this.$util.redirectTo('/pages/order/detail', {order_id: id}); this.$util.redirectTo('/pages_rush/order/detail', {order_id: id});
} }
}, },
//切换分类 //切换分类

6
pages_promotion/pinfan/share.vue
View File

@ -243,13 +243,13 @@ export default {
switch (parseInt(data.order_type)) { switch (parseInt(data.order_type)) {
case 2: case 2:
// 自提订单 // 自提订单
this.$util.redirectTo('/pages/order/detail_pickup', { this.$util.redirectTo('/pages_rush/order/detail_pickup', {
order_id: data.order_id order_id: data.order_id
}); });
break; break;
case 3: case 3:
// 本地配送订单 // 本地配送订单
this.$util.redirectTo('/pages/order/detail_local_delivery', { this.$util.redirectTo('/pages_rush/order/detail_local_delivery', {
order_id: data.order_id order_id: data.order_id
}); });
break; break;
@ -260,7 +260,7 @@ export default {
}); });
break; break;
default: default:
this.$util.redirectTo('/pages/order/detail', { this.$util.redirectTo('/pages_rush/order/detail', {
order_id: data.order_id order_id: data.order_id
}); });
break; break;

2
pages_promotion/pintuan/list.vue
View File

@ -59,7 +59,7 @@
</template> </template>
<script> <script>
import nsAdv from '@/components/ns-adv/ns-adv.vue'; import nsAdv from '@/pages_promotion/components/ns-adv/ns-adv.vue';
export default { export default {
components: { components: {
nsAdv nsAdv

2
pages_promotion/pintuan/my_spell.vue
View File

@ -192,7 +192,7 @@
}); });
}, },
toOrderDetail(id) { toOrderDetail(id) {
this.$util.redirectTo('/pages/order/detail', { this.$util.redirectTo('/pages_rush/order/detail', {
order_id: id order_id: id
}); });
}, },

2
pages_promotion/pintuan/public/js/detail.js
View File

@ -160,7 +160,7 @@ export default {
content: '您有一个拼团订单待付款，是否现在跳转支付？', content: '您有一个拼团订单待付款，是否现在跳转支付？',
success: function (res) { success: function (res) {
if (res.confirm) { if (res.confirm) {
that.$util.redirectTo('/pages/order/detail', {'order_id':that.groupDetail.order_id}); that.$util.redirectTo('/pages_rush/order/detail', {'order_id':that.groupDetail.order_id});
} else if (res.cancel) { } else if (res.cancel) {
} }

6
pages_promotion/pintuan/share.vue
View File

@ -353,13 +353,13 @@ export default {
switch (parseInt(data.order_type)) { switch (parseInt(data.order_type)) {
case 2: case 2:
// 自提订单 // 自提订单
this.$util.redirectTo('/pages/order/detail_pickup', { this.$util.redirectTo('/pages_rush/order/detail_pickup', {
order_id: data.order_id order_id: data.order_id
}); });
break; break;
case 3: case 3:
// 本地配送订单 // 本地配送订单
this.$util.redirectTo('/pages/order/detail_local_delivery', { this.$util.redirectTo('/pages_rush/order/detail_local_delivery', {
order_id: data.order_id order_id: data.order_id
}); });
break; break;
@ -370,7 +370,7 @@ export default {
}); });
break; break;
default: default:
this.$util.redirectTo('/pages/order/detail', { this.$util.redirectTo('/pages_rush/order/detail', {
order_id: data.order_id order_id: data.order_id
}); });
break; break;

8
pages_promotion/point/order_list.vue
View File

@ -214,17 +214,17 @@
if (item.type == 1 && item.relate_order_id) { if (item.type == 1 && item.relate_order_id) {
switch (item.delivery_type) { switch (item.delivery_type) {
case 'store': case 'store':
this.$util.redirectTo('/pages/order/detail_pickup', { this.$util.redirectTo('/pages_rush/order/detail_pickup', {
order_id: item.relate_order_id order_id: item.relate_order_id
}); });
break; break;
case 'local': case 'local':
this.$util.redirectTo('/pages/order/detail_local_delivery', { this.$util.redirectTo('/pages_rush/order/detail_local_delivery', {
order_id: item.relate_order_id order_id: item.relate_order_id
}); });
break; break;
case 'express': case 'express':
this.$util.redirectTo('/pages/order/detail', { this.$util.redirectTo('/pages_rush/order/detail', {
order_id: item.relate_order_id order_id: item.relate_order_id
}); });
break; break;
@ -234,7 +234,7 @@
}); });
} }
} else { } else {
this.$util.redirectTo('/pages/order/detail_point', { this.$util.redirectTo('/pages_rush/order/detail_point', {
order_id: item.order_id order_id: item.order_id
}); });
} }

2
pages_promotion/presale/order_detail.vue
View File

@ -331,7 +331,7 @@ export default {
if (uni.getStorageSync('token')) { if (uni.getStorageSync('token')) {
this.getOrderData(); this.getOrderData();
} else { } else {
this.$util.redirectTo('/pages_tool/login/login', { back: '/pages/order/detail?order_id=' + this.orderId }); this.$util.redirectTo('/pages_tool/login/login', { back: '/pages_rush/order/detail?order_id=' + this.orderId });
} }
this.getMmemberBalance(); this.getMmemberBalance();
}, },

2
pages_promotion/topics/list.vue
View File

@ -25,7 +25,7 @@
</template> </template>
<script> <script>
import nsAdv from '@/components/ns-adv/ns-adv.vue'; import nsAdv from '@/pages_promotion/components/ns-adv/ns-adv.vue';
export default { export default {
components: { components: {
nsAdv nsAdv

10
pages_promotion/article/detail.vue → pages_rush/article/detail.vue
View File

@ -28,7 +28,7 @@
<!--顶部内容--> <!--顶部内容-->
<view class="top"> <view class="top">
<view class="title">推荐阅读</view> <view class="title">推荐阅读</view>
<view class="more-info" @click="$util.redirectTo('/pages_promotion/article/list')"> <view class="more-info" @click="$util.redirectTo('/pages_rush/article/list')">
查看更多<van-icon class="arrow" name="arrow" /> 查看更多<van-icon class="arrow" name="arrow" />
</view> </view>
</view> </view>
@ -65,7 +65,7 @@
<script> <script>
import htmlParser from '@/common/js/html-parser'; import htmlParser from '@/common/js/html-parser';
import share from '@/components/share-panel/share-panel'; import share from '@/pages_rush/components/share-panel/share-panel';
export default { export default {
components:{ components:{
@ -148,7 +148,7 @@ export default {
title: res.message title: res.message
}); });
setTimeout(() => { setTimeout(() => {
this.$util.redirectTo('/pages_promotion/article/list', {}, 'redirectTo'); this.$util.redirectTo('/pages_rush/article/list', {}, 'redirectTo');
}, 2000); }, 2000);
} }
@ -219,7 +219,7 @@ export default {
}, },
// 点击跳转 —— 文章详情 // 点击跳转 —— 文章详情
goToDetail(id) { goToDetail(id) {
this.$util.redirectTo('/pages_promotion/article/detail', { article_id: id }); this.$util.redirectTo('/pages_rush/article/detail', { article_id: id });
}, },
// 获取分享奖励 // 获取分享奖励
shareReward(options){ shareReward(options){
@ -237,7 +237,7 @@ export default {
}, },
onShareAppMessage(res) { onShareAppMessage(res) {
var title = this.detail.article_title; var title = this.detail.article_title;
var path = '/pages_promotion/article/detail?article_id=' + this.articleId; var path = '/pages_rush/article/detail?article_id=' + this.articleId;
return { return {
title: title, title: title,
path: path, path: path,

10
pages_promotion/article/list.vue → pages_rush/article/list.vue
View File

@ -62,7 +62,7 @@
<view class="top"> <view class="top">
<view class="title">精选推荐</view> <view class="title">精选推荐</view>
<view class="more-info" @click="cate_ids = 'recommend-list'"> <view class="more-info" @click="cate_ids = 'recommend-list'">
查看更多<van-icon class="arrow" name="arrow" /> 查看更多 <van-icon class="arrow" name="arrow" />
</view> </view>
</view> </view>
<!--推荐列表--> <!--推荐列表-->
@ -118,9 +118,8 @@
</template> </template>
<script> <script>
export default { export default {
components: {}, components: { },
data() { data() {
return { return {
liulan: this.$util.img('public/picture/aijiu/liulan.png'), liulan: this.$util.img('public/picture/aijiu/liulan.png'),
@ -311,7 +310,7 @@ export default {
}, },
// 点击跳转 —— 文章详情 // 点击跳转 —— 文章详情
goToDetail(id) { goToDetail(id) {
this.$util.redirectTo('/pages_promotion/article/detail', { article_id: id }); this.$util.redirectTo('/pages_rush/article/detail', { article_id: id });
}, },
// 点击跳转 —— 签到 // 点击跳转 —— 签到
goToSign() { goToSign() {
@ -319,13 +318,14 @@ export default {
}, },
// 改变顶部标签 // 改变顶部标签
changeTabs(event){ changeTabs(event){
console.log(event);
this.cate_ids = event.detail.name; this.cate_ids = event.detail.name;
} }
}, },
onShareAppMessage(res) { onShareAppMessage(res) {
var title = '文章列表'; var title = '文章列表';
var path = '/pages_promotion/article/list'; var path = '/pages_rush/article/list';
return { return {
title: title, title: title,
path: path, path: path,

0
pages_promotion/article/public/img/dianzan.png → pages_rush/article/public/img/dianzan.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

0
pages_promotion/article/public/img/fenxiang.png → pages_rush/article/public/img/fenxiang.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

0
pages_promotion/article/public/img/liulan.png → pages_rush/article/public/img/liulan.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

4
pages_promotion/article/record.vue → pages_rush/article/record.vue
View File

@ -118,7 +118,7 @@ export default {
}, },
// 点击跳转 —— 文章详情 // 点击跳转 —— 文章详情
goToDetail(id) { goToDetail(id) {
this.$util.redirectTo('/pages_promotion/article/detail', { article_id: id }); this.$util.redirectTo('/pages_rush/article/detail', { article_id: id });
}, },
// 删除浏览记录、取消点赞 // 删除浏览记录、取消点赞
deleteBrowseRecord(article_id){ deleteBrowseRecord(article_id){
@ -153,7 +153,7 @@ export default {
}, },
onShareAppMessage(res) { onShareAppMessage(res) {
var title = '记录'; var title = '记录';
var path = '/pages_promotion/article/record.vue'; var path = '/pages_rush/article/record.vue';
return { return {
title: title, title: title,
path: path, path: path,

6
components/share-panel/share-panel.vue → pages_rush/components/share-panel/share-panel.vue
View File

@ -34,9 +34,9 @@
</template> </template>
<script> <script>
import uQRCode from 'common/js/uqrcode.js' import uQRCode from '@/common/js/uqrcode.js'
import {Weixin} from "../../common/js/wx-jssdk"; import {Weixin} from "@/common/js/wx-jssdk";
import Http from "../../common/js/http"; import Http from "@/common/js/http";
export default { export default {
name: 'share-panel', name: 'share-panel',

0
components/uni-popup-dialog/keypress.js → pages_rush/components/uni-popup-dialog/keypress.js
View File

0
components/uni-popup-dialog/uni-popup-dialog.vue → pages_rush/components/uni-popup-dialog/uni-popup-dialog.vue
View File

0
components/uni-popup-new/i18n/en.json → pages_rush/components/uni-popup-new/i18n/en.json
View File

0
components/uni-popup-new/i18n/index.js → pages_rush/components/uni-popup-new/i18n/index.js
View File

0
components/uni-popup-new/i18n/zh-Hans.json → pages_rush/components/uni-popup-new/i18n/zh-Hans.json
View File

0
components/uni-popup-new/i18n/zh-Hant.json → pages_rush/components/uni-popup-new/i18n/zh-Hant.json
View File

0
components/uni-popup-new/keypress.js → pages_rush/components/uni-popup-new/keypress.js
View File

0
components/uni-popup-new/popup.js → pages_rush/components/uni-popup-new/popup.js
View File

0
components/uni-popup-new/uni-popup.vue → pages_rush/components/uni-popup-new/uni-popup.vue
View File

0
components/uni-transition/createAnimation.js → pages_rush/components/uni-transition/createAnimation.js
View File

0
components/uni-transition/uni-transition.vue → pages_rush/components/uni-transition/uni-transition.vue
View File

10
pages_promotion/futures/details.vue → pages_rush/futures/details.vue
View File

@ -80,9 +80,9 @@
</template> </template>
<script> <script>
import uniTransition from '@/components/uni-transition/uni-transition.vue'; import uniTransition from '@/pages_rush/components/uni-transition/uni-transition.vue';
import uniPopup from '@/components/uni-popup-new/uni-popup.vue'; import uniPopup from '@/pages_rush/components/uni-popup-new/uni-popup.vue';
import uniPopupDialog from '@/components/uni-popup-dialog/uni-popup-dialog.vue'; import uniPopupDialog from '@/pages_rush/components/uni-popup-dialog/uni-popup-dialog.vue';
export default { export default {
components: { components: {
@ -115,7 +115,7 @@ export default {
onShow() {}, onShow() {},
onReady(){ onReady(){
// 判断是否登录 // 判断是否登录
if (!uni.getStorageSync('token')) this.$refs.login.open('/pages_promotion/futures/seckill'); if (!uni.getStorageSync('token')) this.$refs.login.open('/pages_rush/futures/seckill');
if (this.$refs.loadingCover) this.$refs.loadingCover.hide(); if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
}, },
@ -174,7 +174,7 @@ export default {
}, },
success: () => { success: () => {
this.isSub = false;//防抖 this.isSub = false;//防抖
this.$util.redirectTo('/pages_promotion/futures/payment'); this.$util.redirectTo('/pages_rush/futures/payment');
} }
}); });
} }

2
pages_promotion/futures/list.vue → pages_rush/futures/list.vue
View File

@ -37,7 +37,7 @@ export default {
onShow() {}, onShow() {},
onReady(){ onReady(){
// 判断是否登录 // 判断是否登录
if (!uni.getStorageSync('token')) this.$refs.login.open('/pages_promotion/futures/list'); if (!uni.getStorageSync('token')) this.$refs.login.open('/pages_rush/futures/list');
if (this.$refs.loadingCover) this.$refs.loadingCover.hide(); if (this.$refs.loadingCover) this.$refs.loadingCover.hide();

4
pages_promotion/futures/my_shop.vue → pages_rush/futures/my_shop.vue
View File

@ -31,7 +31,7 @@
<view class="menu-list"> <view class="menu-list">
<view class="title">小店订单</view> <view class="title">小店订单</view>
<view class="menu-list-content"> <view class="menu-list-content">
<view class="menu-block" v-for="(item,index) in menu" :key="index" @click="$util.redirectTo('/pages_promotion/futures/order',{ status: item.status })"> <view class="menu-block" v-for="(item,index) in menu" :key="index" @click="$util.redirectTo('/pages_rush/futures/order',{ status: item.status })">
<view class="left" :style="{ background: item.background}"> <view class="left" :style="{ background: item.background}">
<image class="top-image" :src="$util.img(item.image)" mode="widthFix"></image> <image class="top-image" :src="$util.img(item.image)" mode="widthFix"></image>
</view> </view>
@ -96,7 +96,7 @@ export default {
onShow() {}, onShow() {},
onReady(){ onReady(){
// 判断是否登录 // 判断是否登录
if (!uni.getStorageSync('token')) this.$refs.login.open('/pages_promotion/futures/seckill'); if (!uni.getStorageSync('token')) this.$refs.login.open('/pages_rush/futures/seckill');
this.getMemberInfo(); this.getMemberInfo();
this.getPunish(); this.getPunish();
}, },

4
pages_promotion/futures/order.vue → pages_rush/futures/order.vue
View File

@ -40,7 +40,7 @@
</view> </view>
</view> </view>
<view class="buttons"> <view class="buttons">
<view class="button-item" @click="$util.redirectTo('/pages_promotion/futures/order_details',{ futures_id: item.id })">查看详情</view> <view class="button-item" @click="$util.redirectTo('/pages_rush/futures/order_details',{ futures_id: item.id })">查看详情</view>
</view> </view>
</view> </view>
</view> </view>
@ -101,7 +101,7 @@ export default {
onShow() {}, onShow() {},
onReady(){ onReady(){
// 判断是否登录 // 判断是否登录
if (!uni.getStorageSync('token')) this.$refs.login.open('/pages_promotion/futures/list'); if (!uni.getStorageSync('token')) this.$refs.login.open('/pages_rush/futures/list');
}, },
watch:{ watch:{
tabs_active: { tabs_active: {

8
pages_promotion/futures/order_details.vue → pages_rush/futures/order_details.vue
View File

@ -114,8 +114,8 @@
</template> </template>
<script> <script>
import uniPopup from '@/components/uni-popup-new/uni-popup.vue'; import uniPopup from '@/pages_rush/components/uni-popup-new/uni-popup.vue';
import uniPopupDialog from '@/components/uni-popup-dialog/uni-popup-dialog.vue'; import uniPopupDialog from '@/pages_rush/components/uni-popup-dialog/uni-popup-dialog.vue';
export default { export default {
components: { components: {
@ -150,7 +150,7 @@ export default {
onShow() {}, onShow() {},
onReady(){ onReady(){
// 判断是否登录 // 判断是否登录
if (!uni.getStorageSync('token')) this.$refs.login.open('/pages_promotion/futures/list'); if (!uni.getStorageSync('token')) this.$refs.login.open('/pages_rush/futures/list');
}, },
methods: { methods: {
// 获取订单详情 // 获取订单详情
@ -264,7 +264,7 @@ export default {
duration: 2000, duration: 2000,
success: function () { success: function () {
setTimeout(() => { setTimeout(() => {
_this.$util.redirectTo('/pages_promotion/futures/order', { status: 'release' }); _this.$util.redirectTo('/pages_rush/futures/order', { status: 'release' });
}, 1000); }, 1000);
} }
}); });

0
pages_promotion/futures/payment.vue → pages_rush/futures/payment.vue
View File

4
pages_promotion/futures/seckill.vue → pages_rush/futures/seckill.vue
View File

@ -35,7 +35,7 @@
<view class="price-item">采购价:<text class="purchase_price">￥{{ item.price }}</text></view> <view class="price-item">采购价:<text class="purchase_price">￥{{ item.price }}</text></view>
</view> </view>
<view class="buy-button"> <view class="buy-button">
<view class="buy-btn" @click="$util.redirectTo('/pages_promotion/futures/details', { id: item.id }, 'redirectTo');">前去采购</view> <view class="buy-btn" @click="$util.redirectTo('/pages_rush/futures/details', { id: item.id }, 'redirectTo');">前去采购</view>
</view> </view>
</view> </view>
</view> </view>
@ -87,7 +87,7 @@ export default {
onLoad(option) {}, onLoad(option) {},
onReady(){ onReady(){
// 判断是否登录 // 判断是否登录
if (!uni.getStorageSync('token')) this.$refs.login.open('/pages_promotion/futures/seckill'); if (!uni.getStorageSync('token')) this.$refs.login.open('/pages_rush/futures/seckill');
}, },
onShow() {}, onShow() {},
methods: { methods: {

8
pages_promotion/message/index.vue → pages_rush/message/index.vue
View File

@ -12,7 +12,7 @@
<view class="titles-block" <view class="titles-block"
v-for="(item,index) in titles" v-for="(item,index) in titles"
:key="index" :key="index"
@click="$util.redirectTo('/pages_promotion/message/list', { message_type: item.type })" @click="$util.redirectTo('/pages_rush/message/list', { message_type: item.type })"
> >
<view class="titles-block-icon"> <view class="titles-block-icon">
<image class="top-image" :src="$util.img(item.icon)" mode="widthFix"></image> <image class="top-image" :src="$util.img(item.icon)" mode="widthFix"></image>
@ -64,8 +64,8 @@
</template> </template>
<script> <script>
import uniPopup from '@/components/uni-popup-new/uni-popup.vue'; import uniPopup from '@/pages_rush/components/uni-popup-new/uni-popup.vue';
import uniPopupDialog from '@/components/uni-popup-dialog/uni-popup-dialog.vue'; import uniPopupDialog from '@/pages_rush/components/uni-popup-dialog/uni-popup-dialog.vue';
export default { export default {
components: { components: {
uniPopup, uniPopup,
@ -89,7 +89,7 @@ export default {
onShow() {}, onShow() {},
onReady(){ onReady(){
// 判断是否登录 // 判断是否登录
if (!uni.getStorageSync('token')) this.$refs.login.open('/pages_promotion/message/index'); if (!uni.getStorageSync('token')) this.$refs.login.open('/pages_rush/message/index');
}, },
methods: { methods: {
// 获取消息列表 // 获取消息列表

2
pages_promotion/message/list.vue → pages_rush/message/list.vue
View File

@ -60,7 +60,7 @@ export default {
onShow() {}, onShow() {},
onReady(){ onReady(){
// 判断是否登录 // 判断是否登录
if (!uni.getStorageSync('token')) this.$refs.login.open('/pages_promotion/futures/list'); if (!uni.getStorageSync('token')) this.$refs.login.open('/pages_rush/futures/list');
}, },
methods: { methods: {
// 获取消息列表 // 获取消息列表

4
pages_promotion/message/words.vue → pages_rush/message/words.vue
View File

@ -49,7 +49,7 @@ export default {
onShow() {}, onShow() {},
onReady(){ onReady(){
// 判断是否登录 // 判断是否登录
if (!uni.getStorageSync('token')) this.$refs.login.open('/pages_promotion/futures/list'); if (!uni.getStorageSync('token')) this.$refs.login.open('/pages_rush/futures/list');
if (this.$refs.loadingCover) this.$refs.loadingCover.hide(); if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
@ -100,7 +100,7 @@ export default {
duration: 1500, duration: 1500,
success: function () { success: function () {
setTimeout(() => { setTimeout(() => {
_this.$util.redirectTo('/pages_promotion/message/index'); _this.$util.redirectTo('/pages_rush/message/index');
}, 1000); }, 1000);
} }
}); });

4
pages/order/detail.vue → pages_rush/order/detail.vue
View File

@ -675,7 +675,7 @@ export default {
this.getEvaluateConfig(); this.getEvaluateConfig();
this.getOrderData(); this.getOrderData();
} else { } else {
this.$util.redirectTo('/pages_tool/login/login', { back: '/pages/order/detail?order_id=' + this.orderId }); this.$util.redirectTo('/pages_tool/login/login', { back: '/pages_rush/order/detail?order_id=' + this.orderId });
} }
}, },
methods: { methods: {
@ -735,7 +735,7 @@ export default {
title: '未获取到订单信息！' title: '未获取到订单信息！'
}); });
setTimeout(() => { setTimeout(() => {
this.$util.redirectTo('/pages/order/list'); this.$util.redirectTo('/pages_rush/order/list');
}, 1500); }, 1500);
} }
}, },

2
pages/order/detail_local_delivery.vue → pages_rush/order/detail_local_delivery.vue
View File

@ -12,7 +12,7 @@ export default {
}, },
onLoad(option) { onLoad(option) {
if (option.order_id) { if (option.order_id) {
this.$util.redirectTo('/pages/order/detail', {order_id: option.order_id}, 'redirectTo'); this.$util.redirectTo('/pages_rush/order/detail', {order_id: option.order_id}, 'redirectTo');
} }
} }
}; };

2
pages/order/detail_pickup.vue → pages_rush/order/detail_pickup.vue
View File

@ -12,7 +12,7 @@ export default {
}, },
onLoad(option) { onLoad(option) {
if (option.order_id) { if (option.order_id) {
this.$util.redirectTo('/pages/order/detail', {order_id: option.order_id}, 'redirectTo'); this.$util.redirectTo('/pages_rush/order/detail', {order_id: option.order_id}, 'redirectTo');
} }
} }
}; };

4
pages/order/detail_point.vue → pages_rush/order/detail_point.vue
View File

@ -160,7 +160,7 @@ export default {
if (uni.getStorageSync('token')) { if (uni.getStorageSync('token')) {
this.getOrderData(); this.getOrderData();
} else { } else {
this.$util.redirectTo('/pages_tool/login/login', { back: '/pages/order/detail_point?order_id=' + this.orderId }); this.$util.redirectTo('/pages_tool/login/login', { back: '/pages_rush/order/detail_point?order_id=' + this.orderId });
} }
}, },
methods: { methods: {
@ -193,7 +193,7 @@ export default {
title: '未获取到订单信息！' title: '未获取到订单信息！'
}); });
setTimeout(() => { setTimeout(() => {
this.$util.redirectTo('/pages/order/list'); this.$util.redirectTo('/pages_rush/order/list');
}, 1500); }, 1500);
} }
}, },

8
pages/order/list.vue → pages_rush/order/list.vue
View File

@ -209,7 +209,7 @@ export default {
if (this.$refs.mescroll) this.$refs.mescroll.refresh(); if (this.$refs.mescroll) this.$refs.mescroll.refresh();
} else { } else {
setTimeout(() => { setTimeout(() => {
this.$refs.login.open('/pages/order/list?status=' + this.orderStatus); this.$refs.login.open('/pages_rush/order/list?status=' + this.orderStatus);
}); });
} }
}, },
@ -343,13 +343,13 @@ export default {
switch (parseInt(data.order_type)) { switch (parseInt(data.order_type)) {
case 2: case 2:
// 自提订单 // 自提订单
this.$util.redirectTo('/pages/order/detail_pickup', { this.$util.redirectTo('/pages_rush/order/detail_pickup', {
order_id: data.order_id order_id: data.order_id
}); });
break; break;
case 3: case 3:
// 本地配送订单 // 本地配送订单
this.$util.redirectTo('/pages/order/detail_local_delivery', { this.$util.redirectTo('/pages_rush/order/detail_local_delivery', {
order_id: data.order_id order_id: data.order_id
}); });
break; break;
@ -360,7 +360,7 @@ export default {
}); });
break; break;
default: default:
this.$util.redirectTo('/pages/order/detail', { this.$util.redirectTo('/pages_rush/order/detail', {
order_id: data.order_id order_id: data.order_id
}); });
break; break;

0
pages/order/payment.vue → pages_rush/order/payment.vue
View File

0
pages/order/public/css/detail.scss → pages_rush/order/public/css/detail.scss
View File

0
pages/order/public/css/list.scss → pages_rush/order/public/css/list.scss
View File

0
pages/order/public/js/orderMethod.js → pages_rush/order/public/js/orderMethod.js
View File

0
pages/order/public/js/refundMethod.js → pages_rush/order/public/js/refundMethod.js
View File

2
pages_tool/chat/room.vue
View File

@ -67,7 +67,7 @@
<script> <script>
import SocketTask from '@/common/js/socketTest.js'; import SocketTask from '@/common/js/socketTest.js';
import chatMessage from '@/components/chat-message/chat-message.vue'; import chatMessage from '@/pages_tool/components/chat-message/chat-message.vue';
import emjoy from '@/common/js/emjoy.js'; import emjoy from '@/common/js/emjoy.js';
export default { export default {
components: { components: {

0
components/chat-message/chat-message.vue → pages_tool/components/chat-message/chat-message.vue
View File

0
components/img-cropping/cropping.vue → pages_tool/components/img-cropping/cropping.vue
View File

0
components/myp-one/myp-one.vue → pages_tool/components/myp-one/myp-one.vue
View File

95
pages_tool/components/ns-adv/ns-adv.vue Normal file
View File

@ -0,0 +1,95 @@
<template>
<view v-if="advList.length" class="adv-wrap">
<swiper :indicator-dots="advList.length > 1" indicator-active-color="#ffffff" :autoplay="true" :interval="3000" :duration="1000" v-if="advList.length > 1" class="ns-adv">
<swiper-item v-for="(item, index) in advList" :key="index" @click="jumppage(item.adv_url)">
<view class="image-box" :style="{ 'background-color': item.background }"><image :src="$util.img(item.adv_image)"></image></view>
</swiper-item>
</swiper>
<view v-else class="adv-wrap ns-adv">
<image :src="$util.img(advList[0]['adv_image'])" mode="widthFix"></image>
</view>
</view>
</template>
<script>
export default {
name: 'ns-advert',
props: {
keyword: {
type: String
}
},
data() {
return {
advList: []
};
},
created() {
this.getAdvList();
},
methods: {
//获取广告位
getAdvList() {
var item = {
adv_image: '',
adv_url: ''
};
this.$api.sendRequest({
url: '/api/adv/detail',
data: {
keyword: this.keyword
},
success: res => {
if (res.code == 0) {
var data = res.data.adv_list;
for (var index in data) {
if (data[index].adv_url) data[index].adv_url = JSON.parse(data[index].adv_url);
}
this.advList = res.data.adv_list;
}
}
});
},
jumppage(e) {
this.$util.diyRedirectTo(e);
}
}
};
</script>
<style>
.adv-wrap {
width: 100%;
}
.bg {
width: 100%;
height: 158rpx;
background-color: #fff;
position: fixed;
left: 0;
/* #ifdef H5 */
top: 88rpx;
/* #endif */
/* #ifdef MP-WEIXIN */
top: 0;
/* #endif */
}
.ns-adv {
background: #fff;
height: 300rpx;
border-radius: 10rpx;
/* padding: 8rpx 24rpx 24rpx; */
}
.ns-adv .image-box {
width: 100%;
height: 100%;
border-radius: 10rpx;
}
.ns-adv image {
width: 100%;
height: 100%;
border-radius: 10rpx;
}
</style>

0
components/sx-rate/common.js → pages_tool/components/sx-rate/common.js
View File

2
components/sx-rate/index.vue → pages_tool/components/sx-rate/index.vue
View File

@ -165,7 +165,7 @@ export default {
}, },
// 点击回调 // 点击回调
onItemClick(e) { onItemClick(e) {
let { val } = e.currentTarget.dataset; let { val } = e.currentTarget.dataset || e.currentTarget.dataset;
this.toggle(val); this.toggle(val);
}, },
// 修改值 // 修改值

10
components/sx-rate/sx-rate/iconfont.css → pages_tool/components/sx-rate/sx-rate/iconfont.css
View File

@ -1,10 +1,10 @@
@font-face {font-family: "iconfont"; @font-face {font-family: "iconfont";
src: url('~@/components/sx-rate/sx-rate/iconfont.eot?t=1574760464482'); /* IE9 */ src: url('~@/pages_tool/components/sx-rate/sx-rate/iconfont.eot?t=1574760464482'); /* IE9 */
src: url('~@/components/sx-rate/sx-rate/iconfont.eot?t=1574760464482#iefix') format('embedded-opentype'), /* IE6-IE8 */ src: url('~@/pages_tool/components/sx-rate/sx-rate/iconfont.eot?t=1574760464482#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAK8AAsAAAAABnAAAAJwAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCCcAp8gQgBNgIkAwgLBgAEIAWEbQcuG6wFyA4lTcHACOEZBUg8fL/2O3f3fTHEkoh28SSayCSxkkgQG6Uz3UvYITu9Qr5K0Vh6Ij6f+8CXKzVBHDvWa6d0lSfK57mc3gQ6kGt8oBz3ojUG9QLqxYEU6B4YRVYqecPYBS7hMYG6QWF0dlOycoGxxFoViFuxkALGuYAksXRVKNccTOJdSTV7zbSAt/D78Y8XxmRKOavq5CZZAOK+7u2svLVode0TggR0vIQc84BEXNQmjugJxumpJ/SNAvsqD77ui8K3i71aBPvrrNIm6IfSe5K58ltNZ3BbU40Blkf9OmKsIW/Un1qddc4dcSma3ArIX7PPXdlxK5l2zJ+aD6TXnQqmu330wqpeWkYN/OnNm/0trU+YvqNR4UN99f+x/tApIFTfR7u39X4gKPnb9pOX5RAQB6DYyc/zOKCD4OUp6KiiPeqnapbAp56NdegrdhLo5wKq+3UG/0fWcyDpCsuWJVVWO5oZO29bXR0FwJ4uV2ONvTeTCVW9I1wVAylyVeNkYudR0rCOsqoN1M1JPd7QDdMTqYZZXQChwwYybT6Q63BIJvYSJX1eUNYReqi7CrsLGyZDbJqIEUWQAPLroJhWKhjHQUyj8mwkrJJROKsI+XyENeIw5LI4xXQqUiA8xxZNtZBHCAMZrJTDFPAcksmUUIWVEkQTlogQVQSbzdS9iUUr5cDUDgyhEIgAxFcHEqMpKTD+eMK09PlsiFAVGQpu6atJ5kMwDfHsEBcLpweZqlX06ruXVzSqCfEQBANiYEpyUAqYh8jIKEGq+nkSCI1gEY2IqURg28OYvlrW+nr5152AOsuUhV2fSy+EwgAAAA==') format('woff2'), url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAK8AAsAAAAABnAAAAJwAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCCcAp8gQgBNgIkAwgLBgAEIAWEbQcuG6wFyA4lTcHACOEZBUg8fL/2O3f3fTHEkoh28SSayCSxkkgQG6Uz3UvYITu9Qr5K0Vh6Ij6f+8CXKzVBHDvWa6d0lSfK57mc3gQ6kGt8oBz3ojUG9QLqxYEU6B4YRVYqecPYBS7hMYG6QWF0dlOycoGxxFoViFuxkALGuYAksXRVKNccTOJdSTV7zbSAt/D78Y8XxmRKOavq5CZZAOK+7u2svLVode0TggR0vIQc84BEXNQmjugJxumpJ/SNAvsqD77ui8K3i71aBPvrrNIm6IfSe5K58ltNZ3BbU40Blkf9OmKsIW/Un1qddc4dcSma3ArIX7PPXdlxK5l2zJ+aD6TXnQqmu330wqpeWkYN/OnNm/0trU+YvqNR4UN99f+x/tApIFTfR7u39X4gKPnb9pOX5RAQB6DYyc/zOKCD4OUp6KiiPeqnapbAp56NdegrdhLo5wKq+3UG/0fWcyDpCsuWJVVWO5oZO29bXR0FwJ4uV2ONvTeTCVW9I1wVAylyVeNkYudR0rCOsqoN1M1JPd7QDdMTqYZZXQChwwYybT6Q63BIJvYSJX1eUNYReqi7CrsLGyZDbJqIEUWQAPLroJhWKhjHQUyj8mwkrJJROKsI+XyENeIw5LI4xXQqUiA8xxZNtZBHCAMZrJTDFPAcksmUUIWVEkQTlogQVQSbzdS9iUUr5cDUDgyhEIgAxFcHEqMpKTD+eMK09PlsiFAVGQpu6atJ5kMwDfHsEBcLpweZqlX06ruXVzSqCfEQBANiYEpyUAqYh8jIKEGq+nkSCI1gEY2IqURg28OYvlrW+nr5152AOsuUhV2fSy+EwgAAAA==') format('woff2'),
url('~@/components/sx-rate/sx-rate/iconfont.woff?t=1574760464482') format('woff'), url('~@/pages_tool/components/sx-rate/sx-rate/iconfont.woff?t=1574760464482') format('woff'),
url('~@/components/sx-rate/sx-rate/iconfont.ttf?t=1574760464482') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */ url('~@/pages_tool/components/sx-rate/sx-rate/iconfont.ttf?t=1574760464482') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
url('~@/components/sx-rate/sx-rate/iconfont.svg?t=1574760464482#iconfont') format('svg'); /* iOS 4.1- */ url('~@/pages_tool/components/sx-rate/sx-rate/iconfont.svg?t=1574760464482#iconfont') format('svg'); /* iOS 4.1- */
} }
.iconfont { .iconfont {

0
components/sx-rate/sx-rate/iconfont.eot → pages_tool/components/sx-rate/sx-rate/iconfont.eot
View File

0
components/sx-rate/sx-rate/iconfont.svg → pages_tool/components/sx-rate/sx-rate/iconfont.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
components/sx-rate/sx-rate/iconfont.ttf → pages_tool/components/sx-rate/sx-rate/iconfont.ttf
View File

0
components/sx-rate/sx-rate/iconfont.woff → pages_tool/components/sx-rate/sx-rate/iconfont.woff
View File

0
components/sx-rate/sx-rate/iconfont.woff2 → pages_tool/components/sx-rate/sx-rate/iconfont.woff2
View File

0
components/uni-calendar/calendar.js → pages_tool/components/uni-calendar/calendar.js
View File

0
components/uni-calendar/uni-calendar-item.vue → pages_tool/components/uni-calendar/uni-calendar-item.vue
View File

0
components/uni-calendar/uni-calendar.vue → pages_tool/components/uni-calendar/uni-calendar.vue
View File

0
components/uni-calendar/util.js → pages_tool/components/uni-calendar/util.js
View File

4
components/uni-nav-bar/uni-nav-bar.vue → pages_tool/components/uni-nav-bar/uni-nav-bar.vue
View File

@ -39,8 +39,8 @@
</template> </template>
<script> <script>
import uniStatusBar from '../uni-status-bar/uni-status-bar.vue'; import uniStatusBar from '@/pages_tool/components/uni-status-bar/uni-status-bar.vue';
import uniIcons from '../uni-icons/uni-icons.vue'; import uniIcons from '@/components/uni-icons/uni-icons.vue';
export default { export default {
name: 'UniNavBar', name: 'UniNavBar',

0
components/uni-status-bar/uni-status-bar.vue → pages_tool/components/uni-status-bar/uni-status-bar.vue
View File

2
pages_tool/goods/brand.vue
View File

@ -21,7 +21,7 @@
<script> <script>
import uniGrid from '@/components/uni-grid/uni-grid.vue'; import uniGrid from '@/components/uni-grid/uni-grid.vue';
import uniGridItem from '@/components/uni-grid-item/uni-grid-item.vue'; import uniGridItem from '@/components/uni-grid-item/uni-grid-item.vue';
import nsAdv from '@/components/ns-adv/ns-adv.vue'; import nsAdv from '@/pages_tool/components/ns-adv/ns-adv.vue';
export default { export default {
components: { components: {
uniGrid, uniGrid,

2
pages_tool/login/find.vue
View File

@ -88,7 +88,7 @@
<script> <script>
import validate from 'common/js/validate.js'; import validate from 'common/js/validate.js';
import mypOne from '@/components/myp-one/myp-one.vue'; import mypOne from '@/pages_tool/components/myp-one/myp-one.vue';
export default { export default {
components: { components: {
mypOne mypOne

Some files were not shown because too many files have changed in this diff Show More