Преглед изворни кода

Merge branch 'master' into zhongqi-optimize

shish пре 3 месеци
родитељ
комит
34a5e184f6
2 измењених фајлова са 14 додато и 3 уклоњено
  1. 12 1
      hdApp/src/admin/billing/affirmGhs.vue
  2. 2 2
      hdApp/src/manifest.json

+ 12 - 1
hdApp/src/admin/billing/affirmGhs.vue

@@ -156,6 +156,14 @@
 								<button class="admin-button-com middle" :class="[form.sendType == 3 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:60upx;" @click="changeSendType(3)">物流</button>
 							</tui-list-cell>
 						</block>
+						<block v-else-if="ghsInfo.shopId == 36919">
+							<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
+								<button class="admin-button-com middle" :class="[form.sendType == 1 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:60upx;"  @click="changeSendType(1)">自取</button>
+								<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 == 2 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:60upx;" @click="changeSendType(2)">跑腿</button>
+								<button class="admin-button-com middle" :class="[form.sendType == 3 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:60upx;" @click="changeSendType(3)">物流</button>
+							</tui-list-cell>
+						</block>
 						<block v-else-if="ghsInfo.shopId == 90985">
 							<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 								<button class="admin-button-com middle" :class="[form.sendType == 1 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:60upx;"  @click="changeSendType(1)">自取</button>
@@ -213,7 +221,7 @@
 
 							</view>
 							<view v-if="form.sendType == 1">
-								<text style="color: #3385FF;width:100%;">到店自取,没有配送费</text>
+								<text style="color: #3385FF;width:100%;">到店自取、自己叫跑腿到店取货,选自取。</text>
 							</view>
 							<view v-if="form.sendType == 3">
 								<text style="color: #3385FF;width:100%;">运费到付</text>
@@ -1045,6 +1053,9 @@ export default {
 				if(that.ghsInfo.shopId && Number(that.ghsInfo.shopId) == 90985){
 					that.form.sendType = 1
 				}
+				if(that.ghsInfo.shopId && Number(that.ghsInfo.shopId) == 36919){
+					that.form.sendType = 1
+				}
 
 				if(res.data && res.data.shopId == 14636){
 					//花瀚鲜花供应链默认冷链

+ 2 - 2
hdApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
-    "versionName" : "2.3.3",
-    "versionCode" : 233,
+    "versionName" : "2.3.4",
+    "versionCode" : 234,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {