shish 2 лет назад
Родитель
Сommit
0bf510cab0

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

@@ -125,6 +125,7 @@
 				<view v-if="ghsInfo.shopId && (ghsInfo.shopId == 520 || ghsInfo.shopId == 1489)"><text style="color:red;font-weight:bold">免费配送每天23:30发车,其它时间请用跑腿或自取</text></view>
 				<view v-if="ghsInfo.shopId && (ghsInfo.shopId == 520 || ghsInfo.shopId == 1489)"><text style="color:red;font-weight:bold">免费配送每天23:30发车,其它时间请用跑腿或自取</text></view>
 				<view><text style="color:red;font-weight:bold">不在配送范围的,请勿选送货上门,否则运费自理</text></view>
 				<view><text style="color:red;font-weight:bold">不在配送范围的,请勿选送货上门,否则运费自理</text></view>
 				<view v-if="ghsInfo.shopId && (ghsInfo.shopId == 11094 || ghsInfo.shopId == 11318)"><text style="color:red;font-weight:bold">所有彩玫瑰1扎损耗3支内不售后</text></view>
 				<view v-if="ghsInfo.shopId && (ghsInfo.shopId == 11094 || ghsInfo.shopId == 11318)"><text style="color:red;font-weight:bold">所有彩玫瑰1扎损耗3支内不售后</text></view>
+				<view v-if="ghsInfo.shopId && (ghsInfo.shopId == 21486)"><text style="color:#3385FF;font-weight:bold">收到货品后,3个小时之内可以申请售后,要求有图片!鲜花是生鲜产品,3个小时后不提供售后</text></view>
 			</block>
 			</block>
 		</view>
 		</view>
 		<view v-if="form.sendType == 1">
 		<view v-if="form.sendType == 1">

+ 4 - 4
hdApp/src/config.js

@@ -1,5 +1,5 @@
 export const ProjectName = 'hd'
 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'

+ 6 - 6
hdApp/src/ext.json

@@ -1,12 +1,12 @@
 {
 {
   "extEnable": true,
   "extEnable": true,
-  "extAppid": "wxe4675bab299a52f7",
+  "extAppid": "wx0d42f5f1dcb3a370",
   "directCommit": false,
   "directCommit": false,
   "ext": {
   "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":"花掌柜"
   }
   }
 }
 }

+ 2 - 3
hdApp/src/manifest.json

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

+ 10 - 0
hdApp/src/pagesPurchase/readMe.vue

@@ -60,6 +60,16 @@
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
+		<view class="list" v-if="shopId == 21486">
+			<view>
+				<view class="title">售后须知:</view>
+			</view>
+			<view>
+				<view class="info">
+				收到货品后,3个小时之内可以申请售后,要求有图片!鲜花是生鲜产品,3个小时后不提供售后。
+                </view>
+			</view>
+		</view>
 		<view class="list" v-if="shopId == 14248">
 		<view class="list" v-if="shopId == 14248">
 			<view>
 			<view>
 				<view class="title">下单须知:</view>
 				<view class="title">下单须知:</view>

+ 6 - 6
hdApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
   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 {
 .iconfont {