Merge branch 'master' into zhongqi-itemUpdate

ghsApp/src/components/app-area-sel.vue

@@ -77,15 +77,7 @@
 				if (!this.keyword) {
 					return false
 				}
-				// 显示加载状态
-				uni.showLoading({
-					title: '搜索中...',
-					mask: true
-				});
 				suggestion({ region: this.city, keyword: this.keyword }).then(res => {
-					uni.hideLoading();
-					//console.log("地址搜索返回数据:", res);
-					
 					// 处理数据结构
 					let dataList = [];
 					if (res && res.data) {
@@ -101,17 +93,7 @@
 							duration: 1800
 						});
 					}
-					//console.log("处理后的地址数据:", this.nearListData);
-				}).catch(err => {
-					uni.hideLoading();
-					console.error("地址请求失败:", err);
-					this.nearListData = [];
-					uni.showToast({
-					title: '搜索失败，请重试',
-					icon: 'none',
-					duration: 2000
-					});
-				});
+				})
 			},
 			// 搜索
 			searchFn(e) {

hdApp/src/admin/billing/affirmGhs.vue

@@ -134,6 +134,7 @@
 						<block v-if="ghsInfo.shopId == 82200">
 							<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 								<button class="admin-button-com middle" :class="[form.sendType == 0 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;"  @click="changeSendType(0)">送货上门</button>
+								<button class="admin-button-com middle" :class="[form.sendType == 1 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:60upx;"  @click="changeSendType(1)">自取</button>
 							</tui-list-cell>
 						</block>
 						<block v-else>

hdApp/src/admin/home/workbench.vue

@@ -975,7 +975,7 @@
           width: 130upx;
           position: absolute;
           left: 570upx;
-          top: 95upx;
+          top: 110upx;
           border-radius:39upx;
           .text_13 {
             color: rgba(255, 255, 255, 1);
@@ -992,7 +992,7 @@
           width: 130upx;
           position: absolute;
           left: 570upx;
-          top: 95upx;
+          top: 110upx;
           border-radius:39upx;
           .text_13 {
             color: rgba(255, 255, 255, 1);
@@ -1009,7 +1009,7 @@
           width: 170upx;
           position: absolute;
           left: 540upx;
-          top: 95upx;
+          top: 110upx;
           border-radius:39upx;
           .text_13 {
             color: rgba(255, 255, 255, 1);

hdApp/src/manifest.json

@@ -223,8 +223,8 @@
         "optimization" : {
             "subPackages" : true
         },
-        "lazyCodeLoading" : "requiredComponents",
-        "uniStatistics" : {
+        "lazyCodeLoading":"requiredComponents",
+       "uniStatistics" : {
             "enable" : false
         },
         "unipush" : {