更新小程序

ghsApp/dist/build/mp-weixin/admin/home/components/module/operate.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/admin/shop/add.wxss

@@ -1 +1 @@
-.app-content.data-v-502ea402{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-502ea402{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-502ea402{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-502ea402{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-502ea402{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-502ea402{height:240rpx}.confirm-btn.data-v-502ea402{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-502ea402{width:100%}
+.app-content.data-v-31f3413a{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-31f3413a{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-31f3413a{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-31f3413a{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-31f3413a{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-31f3413a{height:240rpx}.confirm-btn.data-v-31f3413a{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-31f3413a{width:100%}

ghsApp/dist/build/mp-weixin/components/app-wrapper-empty.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/module/allSelectInput.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/module/app-close.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/module/app-share-mask.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/module/app-tag.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/plugin/bottom-popup.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/plugin/fab.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/plugin/tabs.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/w-picker/date-picker.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/w-picker/half-picker.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/w-picker/linkage-picker.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/w-picker/range-picker.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/w-picker/region-picker.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/w-picker/selector-picker.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/w-picker/shortterm-picker.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/w-picker/time-picker.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/pagesArrears/detailsItem.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/pagesInvite/inviteItem.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/admin/home/components/plugin/timeaxis-item.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/admin/order/components/card-name.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/admin/shop/add.wxss

@@ -1 +1 @@
-.app-content.data-v-059520d4{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-059520d4{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-059520d4{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-059520d4{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-059520d4{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-059520d4{height:240rpx}.confirm-btn.data-v-059520d4{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-059520d4{width:100%}
+.app-content.data-v-36835a0c{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-36835a0c{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-36835a0c{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-36835a0c{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-36835a0c{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-36835a0c{height:240rpx}.confirm-btn.data-v-36835a0c{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-36835a0c{width:100%}

hdApp/dist/build/mp-weixin/components/app-uploader.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/app-wrapper-empty.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/module/allMoreSelectInput.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/components/module/allSelectInput.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/components/module/app-avatar.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/module/app-footer-cart.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/components/plugin/alert.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/components/plugin/bottom-popup.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/plugin/rate.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/components/plugin/t-table/t-table.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/plugin/t-table/t-th.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/pagesPurchase/components/gatheringList.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

mallApp/dist/build/mp-weixin/components/app-coupon-sel.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

mallApp/dist/build/mp-weixin/components/app-img.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

mallApp/dist/build/mp-weixin/components/module/app-avatar.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

mallApp/dist/build/mp-weixin/components/module/app-search.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

mallApp/dist/build/mp-weixin/components/module/app-share-mask.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

mallApp/dist/build/mp-weixin/components/module/app-trademark.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

mallApp/dist/build/mp-weixin/components/module/app-vip.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

mallApp/dist/build/mp-weixin/components/plugin/bottom-popup.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

mallApp/dist/build/mp-weixin/components/plugin/list-cell.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

mallApp/dist/build/mp-weixin/components/plugin/modal.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

mallApp/dist/build/mp-weixin/pages/home/components/goods-list-middle.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

mallApp/dist/build/mp-weixin/pages/home/index.wxml

@@ -1 +1 @@
-<view class="app-main app-content _div data-v-1f32617a"><block wx:if="{{!$root.g0}}"><app-swiper vue-id="6b3d36ea-1" list="{{ad}}" data-event-opts="{{[['^detail',[['adDetailFn']]]]}}" bind:detail="__e" class="data-v-1f32617a" bind:__l="__l"></app-swiper></block><block wx:if="{{!$root.g1}}"><block class="data-v-1f32617a"><block wx:for="{{category}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="goods-module _div data-v-1f32617a"><block wx:if="{{item.showRow==1}}"><goods-list-big vue-id="{{'6b3d36ea-2-'+index}}" info="{{item}}" class="data-v-1f32617a" bind:__l="__l"></goods-list-big></block><block wx:if="{{item.showRow==2}}"><goods-list-small vue-id="{{'6b3d36ea-3-'+index}}" info="{{item}}" class="data-v-1f32617a" bind:__l="__l"></goods-list-small></block></view></block></block></block><app-trademark vue-id="6b3d36ea-4" class="data-v-1f32617a" bind:__l="__l"></app-trademark><tab-bar vue-id="6b3d36ea-5" current="{{0}}" class="data-v-1f32617a" bind:__l="__l"></tab-bar></view>
+<view class="app-main app-content _div data-v-4af02d49"><block wx:if="{{!$root.g0}}"><app-swiper vue-id="6b3d36ea-1" list="{{ad}}" data-event-opts="{{[['^detail',[['adDetailFn']]]]}}" bind:detail="__e" class="data-v-4af02d49" bind:__l="__l"></app-swiper></block><block wx:if="{{!$root.g1}}"><block class="data-v-4af02d49"><block wx:for="{{category}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="goods-module _div data-v-4af02d49"><block wx:if="{{item.showRow==1}}"><goods-list-big vue-id="{{'6b3d36ea-2-'+index}}" info="{{item}}" class="data-v-4af02d49" bind:__l="__l"></goods-list-big></block><block wx:if="{{item.showRow==2}}"><goods-list-small vue-id="{{'6b3d36ea-3-'+index}}" info="{{item}}" class="data-v-4af02d49" bind:__l="__l"></goods-list-small></block></view></block></block></block><app-trademark vue-id="6b3d36ea-4" class="data-v-4af02d49" bind:__l="__l"></app-trademark><tab-bar vue-id="6b3d36ea-5" current="{{0}}" class="data-v-4af02d49" bind:__l="__l"></tab-bar></view>

mallApp/dist/build/mp-weixin/pages/home/index.wxss

@@ -1 +1 @@
-.goods-module.data-v-1f32617a{padding:0 20rpx;margin-top:40rpx}.goods-module.data-v-1f32617a .buy-com-btn{font-size:24rpx;padding:10rpx 20rpx 12rpx;box-shadow:8rpx 8rpx 20rpx #eee}
+.goods-module.data-v-4af02d49{padding:0 20rpx;margin-top:40rpx}.goods-module.data-v-4af02d49 .buy-com-btn{font-size:24rpx;padding:10rpx 20rpx 12rpx;box-shadow:8rpx 8rpx 20rpx #eee}

mallApp/src/pages/pay/index.vue

@@ -148,7 +148,7 @@
 				getOrderShop().then(res => {
 					this.inpFocus = true
 					uni.setNavigationBarTitle({
-						title: `您正在向【${res.shop.shopName}】付款`
+						title: `您正在向【${res.shop.merchantName} ${res.shop.shopName}】付款`
 					})
 
 					this.$refs.couponSel._getUserDiscount().then(status => {

mallApp/src/utils/util.js

@@ -180,7 +180,6 @@ export const $formatDate = (num, fmt = 'YYYY-MM-DD HH:mm', all) => {
  * @parmas item.type 为跳转调用的函数 1为navigateTo, 2为redirectTo, 3为reLaunch, 4为switchTab
  */
 export const pageTo = (item) => {
-	console.log('item', item)
 	if (isNumber(item)) {
 		uni.navigateBack({
 			delta: item
@@ -207,7 +206,8 @@ export const pageTo = (item) => {
 				url: allUrl
 			})
 		} else if (item.type == 4) {
-			console.log('switchTab', item.query)
+			console.log('item', item)
+			console.log('switch shop', item.query)
 			uni.setStorageSync('switchTabQuery', item.query)
 			if (item.query.account) {
 				uni.setStorageSync('account', item.query.account)