下单

hdApp/src/admin/billing/affirmGhs.vue

@@ -59,7 +59,17 @@
 
 
 <block v-if="ghsInfo.pfLevel && ghsInfo.pfLevel == 1">
-	<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
+
+	<tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="ghsInfo.shopId == 14636">
+		<button class="admin-button-com middle" :class="[form.transType == 2 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;margin-right:11upx;font-size:23upx;" @click="changeTransType(2)">冷链物流</button>
+		<button class="admin-button-com middle" :class="[form.transType == 3 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;margin-right:11upx;font-size:23upx;" @click="changeTransType(3)">航空物流</button>
+		<button class="admin-button-com middle" :class="[form.transType == 0 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;margin-right:11upx;font-size:23upx;"  @click="changeTransType(0)">德邦物流</button>
+		<button class="admin-button-com middle" :class="[form.transType == 1 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;margin-right:11upx;font-size:23upx;"  @click="changeTransType(1)">顺丰物流</button>
+		<button class="admin-button-com middle" :class="[form.transType == 4 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;margin-right:11upx;font-size:23upx;"  @click="changeTransType(4)">同城配送</button>
+		<button class="admin-button-com middle" :class="[form.transType == 5 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;font-size:23upx;"  @click="changeTransType(5)">到店自取</button>
+	</tui-list-cell>
+
+	<tui-list-cell class="line-cell" :hover="false" :arrow="false" v-else>
 		<button class="admin-button-com middle" :class="[form.transType == 4 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;margin-right:11upx;font-size:23upx;"  @click="changeTransType(4)">同城配送</button>
 		<button class="admin-button-com middle" :class="[form.transType == 0 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;margin-right:11upx;font-size:23upx;"  @click="changeTransType(0)">德邦物流</button>
 		<button class="admin-button-com middle" :class="[form.transType == 1 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;margin-right:11upx;font-size:23upx;"  @click="changeTransType(1)">顺丰物流</button>
@@ -82,9 +92,12 @@
 			<view v-if="form.transType == 2 || form.transType == 3">
 				<text style="color:red;width:100%;font-weight:bold;">提货自理</text>
 			</view>
+			<view v-if="form.transType != 5">
+				<text style="color:#3385FF;width:100%;font-weight:bold;">早班或晚班，指定发物流公司请备注。</text>
+			</view>
 			<view v-if="form.transType != 5">
 				<text v-if="ghsInfo.shopId == 13398" style="color:red;width:100%;font-weight:bold;">本店昆明直发包邮到店，购买数量需要15扎以上，低于15扎请联系当地店长！</text>
-				<text v-else style="color:#3385FF;width:100%;font-weight:bold;">运费预收，根据实际产生物流费用，多退少补。如有退款则原路退回。</text>
+				<text v-else style="color:#3385FF;width:100%;font-weight:bold;">运费预收，根据实际产生物流费用，多退少补。有退款会原路退回。</text>
 			</view>
 		</block>
 	</view>
@@ -313,7 +326,6 @@ export default {
 	},
 	onLoad() {
 		this.getGhsData(this.option.id)
-		this.changeTransType(4)
 	},
 	onShow() {
 		if(this.selectedHb.hbId && this.selectedHb.hbId > 0) {
@@ -650,6 +662,13 @@ export default {
 					that.form.sendType = 1
 				}
 
+				if(res.data && res.data.shopId == 14636){
+					//花瀚鲜花供应链默认冷链
+					this.changeTransType(2)
+				}else{
+					this.changeTransType(4)
+				}
+
 			});
 		},
 		countAllPrices(e){

hdApp/src/config.js

@@ -1,5 +1,5 @@
 export const ProjectName = 'hd'
-export const APIHOST = 'https://api.shop.huaml.com'
-export const FORMALHOST = 'https://shop.huaml.com'
-export const IMGHOST = 'https://img.huaml.com'
-export const CURRENT_ENV = 'dev'
+export const APIHOST = 'https://api.shop.huahb.cn'
+export const FORMALHOST = 'https://shop.huahb.cn'
+export const IMGHOST = 'https://img.huahb.cn'
+export const CURRENT_ENV = 'production'

hdApp/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wxe4675bab299a52f7",
+  "extAppid": "wx0d42f5f1dcb3a370",
   "directCommit": false,
   "ext": {
-    "account": 12362,
-    "apiHost": "https://api.shop.huaml.com",
-    "socketApiHost": "api.shop.huaml.com",
-    "imgHost": "https://img.huaml.com",
-    "name":"花美玲"
+    "account": 12358,
+    "apiHost": "https://api.shop.huahb.cn",
+    "socketApiHost": "api.shop.huahb.cn",
+    "imgHost": "https://img.huahb.cn",
+    "name":"花掌柜"
   }
 }

hdApp/src/manifest.json

@@ -152,7 +152,7 @@
     "quickapp" : {},
     /* 小程序特有相关 线上（花掌柜） wx0d42f5f1dcb3a370 开发（花美玲） wxe4675bab299a52f7 */
     "mp-weixin" : {
-        "appid" : "wxe4675bab299a52f7",
+        "appid" : "wx0d42f5f1dcb3a370",
         "setting" : {
             "urlCheck" : false
         },
@@ -164,8 +164,7 @@
         },
         "optimization" : {
             "subPackages" : true
-        },
-        "lazyCodeLoading":"requiredComponents"
+        }
     },
     "mp-alipay" : {
         "usingComponents" : true

hdApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {