Merge branch 'master' of http://git.huaml.com/zhh/front-end

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

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

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/home/components/plugin/time-axis.json

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

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

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

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

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

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

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

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

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

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

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

ghsApp/dist/build/mp-weixin/components/module/app-search.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/modal.json

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

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

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

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/pagesClient/official/apply.wxss

@@ -1 +1 @@
-.module-com.data-v-8e2083ba{margin-bottom:20rpx;background-color:#fff}.module-com .module-tit.data-v-8e2083ba{padding:20rpx 18rpx;font-size:28rpx;font-weight:600;border-bottom:1rpx solid #eee}.module-com .module-det.data-v-8e2083ba{padding:0 30rpx}.line-cell .tui-title.data-v-8e2083ba{width:210rpx;color:#666}.line-cell .tui-input.data-v-8e2083ba{width:calc(100% - 210rpx);font-size:28rpx}.line-cell .tui-placeholder.data-v-8e2083ba{color:#ccc}.line-cell .phcolor.data-v-8e2083ba{color:#ccc}.btn-wrap.data-v-8e2083ba{width:90%;margin:60rpx auto}.btn-wrap .admin-button-com.data-v-8e2083ba{width:100%;margin:0 auto}.code-wrap .tui-input.data-v-8e2083ba{width:calc(100% - 410rpx);font-size:28rpx}.code-wrap .tui-code.data-v-8e2083ba{width:200rpx;text-align:center;border-left:1rpx solid #eee;color:#3385ff}.recommend-wrap.data-v-8e2083ba{padding:30rpx 45rpx}.recommend-wrap .recommend-tag.data-v-8e2083ba{font-size:28rpx;color:#666;margin-bottom:24rpx}.recommend-wrap .recommend-det.data-v-8e2083ba{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start}.recommend-wrap .recommend-det .recommend-info.data-v-8e2083ba{margin-left:20rpx}.recommend-wrap .recommend-det .recommend-info .app-size-32.data-v-8e2083ba{margin-bottom:4rpx}
+.module-com.data-v-a3313d48{margin-bottom:20rpx;background-color:#fff}.module-com .module-tit.data-v-a3313d48{padding:20rpx 18rpx;font-size:28rpx;font-weight:600;border-bottom:1rpx solid #eee}.module-com .module-det.data-v-a3313d48{padding:0 30rpx}.line-cell .tui-title.data-v-a3313d48{width:210rpx;color:#666}.line-cell .tui-input.data-v-a3313d48{width:calc(100% - 210rpx);font-size:28rpx}.line-cell .tui-placeholder.data-v-a3313d48{color:#ccc}.line-cell .phcolor.data-v-a3313d48{color:#ccc}.btn-wrap.data-v-a3313d48{width:90%;margin:60rpx auto}.btn-wrap .admin-button-com.data-v-a3313d48{width:100%;margin:0 auto}.code-wrap .tui-input.data-v-a3313d48{width:calc(100% - 410rpx);font-size:28rpx}.code-wrap .tui-code.data-v-a3313d48{width:200rpx;text-align:center;border-left:1rpx solid #eee;color:#3385ff}.recommend-wrap.data-v-a3313d48{padding:30rpx 45rpx}.recommend-wrap .recommend-tag.data-v-a3313d48{font-size:28rpx;color:#666;margin-bottom:24rpx}.recommend-wrap .recommend-det.data-v-a3313d48{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start}.recommend-wrap .recommend-det .recommend-info.data-v-a3313d48{margin-left:20rpx}.recommend-wrap .recommend-det .recommend-info .app-size-32.data-v-a3313d48{margin-bottom:4rpx}

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

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

ghsApp/dist/build/mp-weixin/pagesPurchase/order.wxml

@@ -1 +1 @@
-<view class="order-page data-v-309b2f72"><scroll-view class="order-list data-v-309b2f72" scroll-y="{{true}}"><block wx:if="{{!$root.g0}}"><block class="data-v-309b2f72"><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><order-item vue-id="{{'74ac7040-1-'+index}}" info="{{item}}" data-event-opts="{{[['^click',[['gotoDetails',['$0'],[[['list.data','',index]]]]]]]}}" bind:click="__e" class="data-v-309b2f72" bind:__l="__l"></order-item></block></block></block><block wx:else><block class="data-v-309b2f72"><app-wrapper-empty vue-id="74ac7040-2" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-309b2f72" bind:__l="__l"></app-wrapper-empty></block></block></scroll-view><view class="app-footer open_btn data-v-309b2f72"><view data-event-opts="{{[['tap',[['addEvent',['$event']]]]]}}" class="admin-button-com middle blue data-v-309b2f72" bindtap="__e">新增采购</view></view></view>
+<view class="order-page data-v-8e9cbe02"><view class="order-list data-v-8e9cbe02" scroll-y="{{true}}"><block wx:if="{{!$root.g0}}"><block class="data-v-8e9cbe02"><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><order-item vue-id="{{'74ac7040-1-'+index}}" info="{{item}}" data-event-opts="{{[['^click',[['gotoDetails',['$0'],[[['list.data','',index]]]]]]]}}" bind:click="__e" class="data-v-8e9cbe02" bind:__l="__l"></order-item></block></block></block><block wx:else><block class="data-v-8e9cbe02"><app-wrapper-empty vue-id="74ac7040-2" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-8e9cbe02" bind:__l="__l"></app-wrapper-empty></block></block></view><view class="app-footer open_btn data-v-8e9cbe02"><view data-event-opts="{{[['tap',[['addEvent',['$event']]]]]}}" class="admin-button-com middle blue data-v-8e9cbe02" bindtap="__e">新增采购</view></view></view>

ghsApp/src/pagesClient/official/apply.vue

@@ -219,7 +219,7 @@ export default {
         // floor: "",
         longitude: "",
         latitude: "",
-
+        showAddress:""
       },
       showRegion: false,
       // 省市联动
@@ -286,7 +286,8 @@ export default {
     },
     changeAreaFn (e) {
       console.log("changeAreaFn", e);
-      this.form.address = e.address;
+      this.form.address = e.title;
+      this.form.showAddress = e.address;
       this.form.latitude = e.location.lat;
       this.form.longitude = e.location.lng;
       this.form.dist = e.district

ghsApp/src/pagesPurchase/details.vue

@@ -311,12 +311,9 @@ export default {
 				if (!this.getMerchantInfo) {
 					await this.initMerchantInfo();
 				}
-				// formData.ghsId = this.getMerchantInfo.id;
 				await createPurchaseOrderApi(formData);
-				this.$msg("确认成功！");
 
 				this.resetSelectInfoByType(this.pageType);
-				// this.$util.pageTo({ url: "/pagesPurchase/result", type: 2 });
 				uni.navigateTo({url:'/common/pageSuccess?title=新增成功'})
 			} catch (error) {}
 		},

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

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

hdApp/dist/build/mp-weixin/admin/home/components/module/operate.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/components/app-date-picker.json

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

hdApp/dist/build/mp-weixin/pagesClient/official/apply.wxss

@@ -1 +1 @@
-.module-com.data-v-6545e128{margin-bottom:20rpx;background-color:#fff}.module-com .module-tit.data-v-6545e128{padding:20rpx 18rpx;font-size:28rpx;font-weight:600;border-bottom:1rpx solid #eee}.module-com .module-det.data-v-6545e128{padding:0 30rpx}.line-cell .tui-title.data-v-6545e128{width:210rpx;color:#666}.line-cell .tui-input.data-v-6545e128{width:calc(100% - 210rpx);font-size:28rpx}.line-cell .tui-placeholder.data-v-6545e128{color:#ccc}.line-cell .phcolor.data-v-6545e128{color:#ccc}.btn-wrap.data-v-6545e128{width:90%;margin:60rpx auto}.btn-wrap .admin-button-com.data-v-6545e128{width:100%;margin:0 auto}.code-wrap .tui-input.data-v-6545e128{width:calc(100% - 410rpx);font-size:28rpx}.code-wrap .tui-code.data-v-6545e128{width:200rpx;text-align:center;border-left:1rpx solid #eee;color:#3385ff}.recommend-wrap.data-v-6545e128{padding:30rpx 45rpx}.recommend-wrap .recommend-tag.data-v-6545e128{font-size:28rpx;color:#666;margin-bottom:24rpx}.recommend-wrap .recommend-det.data-v-6545e128{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start}.recommend-wrap .recommend-det .recommend-info.data-v-6545e128{margin-left:20rpx}.recommend-wrap .recommend-det .recommend-info .app-size-32.data-v-6545e128{margin-bottom:4rpx}
+.module-com.data-v-66b45273{margin-bottom:20rpx;background-color:#fff}.module-com .module-tit.data-v-66b45273{padding:20rpx 18rpx;font-size:28rpx;font-weight:600;border-bottom:1rpx solid #eee}.module-com .module-det.data-v-66b45273{padding:0 30rpx}.line-cell .tui-title.data-v-66b45273{width:210rpx;color:#666}.line-cell .tui-input.data-v-66b45273{width:calc(100% - 210rpx);font-size:28rpx}.line-cell .tui-placeholder.data-v-66b45273{color:#ccc}.line-cell .phcolor.data-v-66b45273{color:#ccc}.btn-wrap.data-v-66b45273{width:90%;margin:60rpx auto}.btn-wrap .admin-button-com.data-v-66b45273{width:100%;margin:0 auto}.code-wrap .tui-input.data-v-66b45273{width:calc(100% - 410rpx);font-size:28rpx}.code-wrap .tui-code.data-v-66b45273{width:200rpx;text-align:center;border-left:1rpx solid #eee;color:#3385ff}.recommend-wrap.data-v-66b45273{padding:30rpx 45rpx}.recommend-wrap .recommend-tag.data-v-66b45273{font-size:28rpx;color:#666;margin-bottom:24rpx}.recommend-wrap .recommend-det.data-v-66b45273{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start}.recommend-wrap .recommend-det .recommend-info.data-v-66b45273{margin-left:20rpx}.recommend-wrap .recommend-det .recommend-info .app-size-32.data-v-66b45273{margin-bottom:4rpx}

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

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

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

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

hdApp/dist/build/mp-weixin/pagesPurchase/orderItem.json

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

hdApp/dist/build/mp-weixin/pagesPurchase/shopping.wxml

@@ -1 +1 @@
-<view class="order-page data-v-2b2b10ca"><app-tabs vue-id="e67a40b4-1" tabs="{{tabs}}" isFixed="{{true}}" currentTab="{{tabIndex}}" itemWidth="20%" data-event-opts="{{[['^change',[['change']]]]}}" bind:change="__e" class="data-v-2b2b10ca" bind:__l="__l"></app-tabs><scroll-view class="pay_list data-v-2b2b10ca"><block wx:if="{{!$root.g0}}"><block class="data-v-2b2b10ca"><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><order-item vue-id="{{'e67a40b4-2-'+index}}" info="{{item}}" data-event-opts="{{[['^click',[['gotoDetails']]]]}}" bind:click="__e" class="data-v-2b2b10ca" bind:__l="__l"></order-item></block></block></block><block wx:else><block class="data-v-2b2b10ca"><app-wrapper-empty vue-id="e67a40b4-3" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-2b2b10ca" bind:__l="__l"></app-wrapper-empty></block></block></scroll-view><view class="app-footer open_btn data-v-2b2b10ca"><view data-event-opts="{{[['tap',[['addEvent',['$event']]]]]}}" class="admin-button-com middle blue data-v-2b2b10ca" bindtap="__e">新增采购</view></view></view>
+<view class="order-page data-v-042e0c6b"><app-tabs vue-id="e67a40b4-1" tabs="{{tabs}}" isFixed="{{true}}" currentTab="{{tabIndex}}" itemWidth="20%" data-event-opts="{{[['^change',[['change']]]]}}" bind:change="__e" class="data-v-042e0c6b" bind:__l="__l"></app-tabs><view class="pay_list data-v-042e0c6b"><block wx:if="{{!$root.g0}}"><block class="data-v-042e0c6b"><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><order-item vue-id="{{'e67a40b4-2-'+index}}" info="{{item}}" data-event-opts="{{[['^click',[['gotoDetails']]]]}}" bind:click="__e" class="data-v-042e0c6b" bind:__l="__l"></order-item></block></block></block><block wx:else><block class="data-v-042e0c6b"><app-wrapper-empty vue-id="e67a40b4-3" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-042e0c6b" bind:__l="__l"></app-wrapper-empty></block></block></view><view class="app-footer open_btn data-v-042e0c6b"><view data-event-opts="{{[['tap',[['addEvent',['$event']]]]]}}" class="admin-button-com middle blue data-v-042e0c6b" bindtap="__e">新增采购</view></view></view>

hdApp/dist/build/mp-weixin/pagesPurchase/shopping.wxss

@@ -1 +1 @@
-.order-page .tabs.data-v-2b2b10ca{height:80rpx;line-height:80rpx}.order-page .tabs > view.data-v-2b2b10ca{width:50%;text-align:center;font-size:28rpx;color:#666;display:inline-block}.order-page .tabs > .active.data-v-2b2b10ca{position:relative;color:#3385ff;font-weight:700}.order-page .tabs > .active.data-v-2b2b10ca::after{content:"";position:absolute;bottom:0;left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%);width:70rpx;height:6rpx;background:#3385ff}.order-page .order_list.data-v-2b2b10ca{height:100%;background:#f0f2f6;padding:0 0 20rpx}.order-page .order_list .list_item.data-v-2b2b10ca{margin:20rpx 0 0;position:relative;height:180rpx;width:100vw;background:#fff;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.order-page .order_list .list_item > image.data-v-2b2b10ca{margin-left:30rpx;width:120rpx;height:120rpx;border-radius:60rpx}.order-page .order_list .list_item > .store_name.data-v-2b2b10ca{margin-left:30rpx}.order-page .order_list .list_item > .store_name > .store_title.data-v-2b2b10ca{margin-bottom:30rpx;font-size:32rpx;font-weight:700;color:#333}.order-page .order_list .list_item > .store_name > .accumulative.data-v-2b2b10ca{font-size:26rpx;color:#999}.order-page .order_list .list_item > .store_btn.data-v-2b2b10ca{position:absolute;right:30rpx}.order-page .order_list .list_item > .store_btn > .btn_entrance.data-v-2b2b10ca{display:inline-block;font-size:26rpx;color:#3385ff;border:1rpx solid #3385ff;border-radius:8rpx;padding:15rpx 30rpx;margin-left:30rpx}.order-page .order_list .list_item > .store_btn > .btn_forbid.data-v-2b2b10ca{border:1rpx solid #999;color:#999}.order-page .pay_list.data-v-2b2b10ca{padding-top:100rpx;padding-bottom:100rpx;background-color:#f0f2f6}
+.order-page .tabs.data-v-042e0c6b{height:80rpx;line-height:80rpx}.order-page .tabs > view.data-v-042e0c6b{width:50%;text-align:center;font-size:28rpx;color:#666;display:inline-block}.order-page .tabs > .active.data-v-042e0c6b{position:relative;color:#3385ff;font-weight:700}.order-page .tabs > .active.data-v-042e0c6b::after{content:"";position:absolute;bottom:0;left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%);width:70rpx;height:6rpx;background:#3385ff}.order-page .order_list.data-v-042e0c6b{height:100%;background:#f0f2f6;padding:0 0 20rpx}.order-page .order_list .list_item.data-v-042e0c6b{margin:20rpx 0 0;position:relative;height:180rpx;width:100vw;background:#fff;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.order-page .order_list .list_item > image.data-v-042e0c6b{margin-left:30rpx;width:120rpx;height:120rpx;border-radius:60rpx}.order-page .order_list .list_item > .store_name.data-v-042e0c6b{margin-left:30rpx}.order-page .order_list .list_item > .store_name > .store_title.data-v-042e0c6b{margin-bottom:30rpx;font-size:32rpx;font-weight:700;color:#333}.order-page .order_list .list_item > .store_name > .accumulative.data-v-042e0c6b{font-size:26rpx;color:#999}.order-page .order_list .list_item > .store_btn.data-v-042e0c6b{position:absolute;right:30rpx}.order-page .order_list .list_item > .store_btn > .btn_entrance.data-v-042e0c6b{display:inline-block;font-size:26rpx;color:#3385ff;border:1rpx solid #3385ff;border-radius:8rpx;padding:15rpx 30rpx;margin-left:30rpx}.order-page .order_list .list_item > .store_btn > .btn_forbid.data-v-042e0c6b{border:1rpx solid #999;color:#999}.order-page .pay_list.data-v-042e0c6b{padding-top:100rpx;padding-bottom:100rpx;background-color:#f0f2f6}

hdApp/src/pagesClient/official/apply.vue

@@ -185,6 +185,7 @@ export default {
         longitude: "",
         latitude: "",
         logo: "",
+        showAddress:""
       },
       showRegion: false,
       // 省市联动
@@ -248,7 +249,8 @@ export default {
       this.showRegion = true;
     },
     changeAreaFn(e) {
-      this.form.address = e.address;
+      this.form.address = e.title;
+      this.form.showAddress = e.address;
       this.form.latitude = e.location.lat;
       this.form.longitude = e.location.lng;
       this.form.dist = e.district;

hdApp/src/pagesPurchase/order.vue

@@ -41,7 +41,6 @@
         </block>
       </block>
     </scroll-view>
-    <kd-entrance></kd-entrance>
   </view>
 </template>
 

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-tag.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/plugin/alert.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/components/plugin/tabs.json

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

mallApp/dist/build/mp-weixin/pages/goods/components/buy-foot.json

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

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

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

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

@@ -1 +1 @@
-.shop-wrap.data-v-66c2cff8{padding:40rpx 20rpx;color:#999;background-color:#fff;margin-bottom:20rpx}.shop-wrap .shop-tit.data-v-66c2cff8{font-size:38rpx;color:#333;font-weight:600;margin-bottom:20rpx}.list-content.data-v-66c2cff8{background-color:#fff}.list-content .tui-list.data-v-66c2cff8{width:calc(100% - 20rpx);display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;margin-left:20rpx}.list-content .tui-list .list-wrap.data-v-66c2cff8{width:calc(100% - 40rpx);display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;color:#999}.list-content .tui-list .list-wrap .list-label.data-v-66c2cff8{width:150rpx;color:#333}.list-content .tui-list .list-wrap .list-val.data-v-66c2cff8{width:calc(100% - 150rpx)}.list-content .tui-list .list-icon.data-v-66c2cff8{margin-right:10rpx}.list-content .tui-list .list-icon .iconfont.data-v-66c2cff8{color:#ff2842;font-weight:700}
+.shop-wrap.data-v-0d728010{padding:40rpx 20rpx;color:#999;background-color:#fff;margin-bottom:20rpx}.shop-wrap .shop-tit.data-v-0d728010{font-size:38rpx;color:#333;font-weight:600;margin-bottom:20rpx}.list-content.data-v-0d728010{background-color:#fff}.list-content .tui-list.data-v-0d728010{width:calc(100% - 20rpx);display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;margin-left:20rpx}.list-content .tui-list .list-wrap.data-v-0d728010{width:calc(100% - 40rpx);display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;color:#999}.list-content .tui-list .list-wrap .list-label.data-v-0d728010{width:150rpx;color:#333}.list-content .tui-list .list-wrap .list-val.data-v-0d728010{width:calc(100% - 150rpx)}.list-content .tui-list .list-icon.data-v-0d728010{margin-right:10rpx}.list-content .tui-list .list-icon .iconfont.data-v-0d728010{color:#ff2842;font-weight:700}

mallApp/src/pages/pay/index.vue

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