开发

ghs/vue.config.js

@@ -3,7 +3,7 @@ const path = require('path');
 const isProduction = process.env.NODE_ENV === 'production';
 
 //http和https切换请修改这里，修改后需要重新运行npm run serve shish 2021.4.12
-const proxyTarget = 'https://api.shop.wixhb.com';
+const proxyTarget = 'http://api.shop.hzghd.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
@@ -14,11 +14,11 @@ function resolve(dir) {
  * **/
 let hostUrl = ``;
 if(process.env.NODE_ENV == 'development'){
-	hostUrl = `https://img.wixhb.com/`;
+	hostUrl = `http://img.hzghd.com/`;
 }else if(process.env.NODE_ENV == 'local'){
-	hostUrl = `https://img.wixhb.com/`;
+	hostUrl = `http://img.hzghd.com/`;
 }else{
-	hostUrl = `https://img.wixhb.com/`;
+	hostUrl = `https://img.hzghd.com/`;
 }
 
 const cdn = {

ghsApp/dist/build/mp-weixin/admin/clear/orderItem.json

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

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

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

ghsApp/dist/build/mp-weixin/admin/home/components/module/operate.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 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

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

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

ghsApp/dist/build/mp-weixin/components/module/allSelectInput.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 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

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

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

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

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

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/selectList.json

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

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

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

ghsApp/dist/build/mp-weixin/pagesPurchase/components/pageSuccess.wxml

@@ -1 +1 @@
-<app-result vue-id="2540701a-1" title="{{title?title:'成功'}}" class="data-v-758e405a" bind:__l="__l" vue-slots="{{['default']}}"><view class="flowers-list-box data-v-758e405a"><view class="flex title data-v-758e405a">采购已入库，建议修改售价：</view><block wx:for="{{flowersList}}" wx:for-item="res" wx:for-index="i" wx:key="i"><view class="flex-space flowers-list data-v-758e405a"><view class="ov-1x flowers-name data-v-758e405a">{{res.name}}</view><view class="flex flowers-val data-v-758e405a"><input type="digit" data-event-opts="{{[['focus',[['priceFocus',[i]]]],['input',[['__set_model',['$0','autoPrice','$event',[]],[[['flowersList','',i]]]],['updatePrice',['$0','$1'],[[['flowersList','',i,'id']],[['flowersList','',i,'autoPrice']]]]]]]}}" value="{{res.autoPrice}}" bindfocus="__e" bindinput="__e" class="data-v-758e405a"/>元</view></view></block></view><button data-event-opts="{{[['tap',[['commitChange',['$event']]]]]}}" class="admin-button-com big blue data-v-758e405a" style="width:80%;margin-top:50rpx;" bindtap="__e">保存修改</button><navigator class="flex-center goHome data-v-758e405a" open-type="switchTab" data-event-opts="{{[['tap',[['goBackHome',['$event']]]]]}}" bindtap="__e">返回首页</navigator></app-result>
+<app-result vue-id="2540701a-1" title="{{title?title:'成功'}}" class="data-v-9051a8f2" bind:__l="__l" vue-slots="{{['default']}}"><view class="flowers-list-box data-v-9051a8f2"><view class="flex title data-v-9051a8f2">已入库，建议修改售价：</view><checkbox-group data-event-opts="{{[['change',[['checkboxChange',['$event']]]]]}}" bindchange="__e" class="data-v-9051a8f2"><block wx:for="{{$root.l0}}" wx:for-item="res" wx:for-index="i" wx:key="i"><view class="data-v-9051a8f2"><view class="product-area data-v-9051a8f2"><view class="first-area data-v-9051a8f2"><text class="data-v-9051a8f2">{{res.$orig.name}}</text><input type="digit" data-event-opts="{{[['focus',[['priceFocus',[i]]]],['input',[['__set_model',['$0','autoPrice','$event',[]],[[['flowersList','',i]]]],['updatePrice',['$0','$1'],[[['flowersList','',i,'id']],[['flowersList','',i,'autoPrice']]]]]]]}}" value="{{res.$orig.autoPrice}}" bindfocus="__e" bindinput="__e" class="data-v-9051a8f2"/></view><view class="second-area data-v-9051a8f2"><block wx:if="{{res.m0!=res.m1&&res.m2>0}}"><view class="change-add-price data-v-9051a8f2"><label class="data-v-9051a8f2">{{'成本价'+res.m3+"，建议加价改成"+res.m4+"元，确认请勾选"}}<checkbox style="transform:scale(0.8);" value="{{res.$orig.id}}" class="data-v-9051a8f2"></checkbox></label></view></block></view></view></view></block></checkbox-group></view><button data-event-opts="{{[['tap',[['commitChange',['$event']]]]]}}" class="admin-button-com big blue data-v-9051a8f2" style="width:80%;margin-top:50rpx;" bindtap="__e">保存修改</button><navigator class="flex-center goHome data-v-9051a8f2" open-type="switchTab" data-event-opts="{{[['tap',[['goBackHome',['$event']]]]]}}" bindtap="__e">返回首页</navigator></app-result>

ghsApp/dist/build/mp-weixin/pagesPurchase/components/pageSuccess.wxss

@@ -1 +1 @@
-.admin-button-com.data-v-758e405a{margin-bottom:20rpx;width:100%}.flowers-list-box.data-v-758e405a{width:100%}.flowers-list-box .title.data-v-758e405a{height:80rpx;border-top:1rpx solid #dcdcdc;font-size:28rpx;font-weight:700}.flowers-list-box .flex-space.data-v-758e405a{width:500rpx}.flowers-list-box .flowers-list.data-v-758e405a{padding:15rpx 0}.flowers-list-box .flowers-list .flowers-name.data-v-758e405a{width:150rpx}.flowers-list-box .flowers-list .flowers-val input.data-v-758e405a{width:160rpx;height:50rpx;padding:0 20rpx;margin-right:20rpx;border:1rpx solid #d4d4d4;text-align:center}.flowers-list-box .flowers-list .flowers-btn.data-v-758e405a{width:100rpx;height:50rpx;color:#fff;background:#69f;border-radius:10rpx}.goHome.data-v-758e405a{width:80%;height:80rpx;color:#fff;margin-top:50rpx;background:#3385ff;border-radius:10rpx;font-size:30rpx}
+.admin-button-com.data-v-9051a8f2{margin-bottom:20rpx;width:100%}.goHome.data-v-9051a8f2{width:80%;height:80rpx;color:#fff;margin-top:50rpx;background:#3385ff;border-radius:10rpx;font-size:30rpx}.title.data-v-9051a8f2{font-weight:700;margin-bottom:30rpx}.product-area.data-v-9051a8f2{width:600rpx;height:120rpx}.product-area .first-area text.data-v-9051a8f2{width:270rpx;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:inline-block}.product-area .first-area input.data-v-9051a8f2{border:1rpx solid #ccc;display:inline-block;width:150rpx;margin-left:30rpx}.product-area .second-area.data-v-9051a8f2{float:left;color:#646464;margin-top:5rpx}

hd/vue.config.js

@@ -3,7 +3,7 @@ const path = require('path');
 const isProduction = process.env.NODE_ENV === 'production';
 
 //http和https切换请修改这里，修改后需要重新运行npm run serve shish 2021.4.12
-const proxyTarget = 'https://api.shop.huahb.cn';
+const proxyTarget = 'http://api.shop.huaml.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
@@ -11,11 +11,11 @@ function resolve(dir) {
 
 let hostUrl = ``;
 if(process.env.NODE_ENV == 'development'){
-	hostUrl = `https://img.huahb.cn/`;
+	hostUrl = `http://img.huaml.com/`;
 }else if(process.env.NODE_ENV == 'local'){
-	hostUrl = `https://img.huahb.cn/`;
+	hostUrl = `http://img.huaml.com/`;
 }else{
-	hostUrl = `https://img.huahb.cn/`;
+	hostUrl = `https://img.huaml.com/`;
 }
 const cdn = {
 	dev: {

mallApp/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wx99a1dfc4171efb42",
+  "extAppid": "wxe41bd5816affd0ba",
   "directCommit": false,
   "ext": {
     "account": 0,
-    "apiHost": "https://api.shop.zhiguanhua.cn",
-    "socketApiHost": "api.shop.zhiguanhua.cn",
-    "imgHost": "https://img.zhiguanhua.cn",
-    "name":"花卉宝"
+    "apiHost": "https://api.shop.theflorist.cn",
+    "socketApiHost": "api.shop.theflorist.cn",
+    "imgHost": "https://img.theflorist.cn",
+    "name":"中花卉"
   }
 }

mallApp/src/manifest.json

@@ -83,7 +83,7 @@
     "quickapp" : {},
     /* 小程序特有相关 线上（花卉宝） wx99a1dfc4171efb42 开发（中花卉） wxe41bd5816affd0ba */
     "mp-weixin" : {
-        "appid" : "wx99a1dfc4171efb42",
+        "appid" : "wxe41bd5816affd0ba",
         "setting" : {
             "urlCheck" : false
         },

mallApp/src/static/iconfont/iconfont.css

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

pt/vue.config.js

@@ -4,7 +4,7 @@ const isProduction = process.env.NODE_ENV === 'production';
 
 //http和https切换请修改这里，修改后需要重新运行 npm run serve 即可 shish 2021.4.12
 const proxyTarget =
-	process.env.NODE_ENV == 'local' ? 'https://api.pt.wixhb.com' : 'https://api.pt.wixhb.com';
+	process.env.NODE_ENV == 'local' ? 'http://api.pt.huaml.com' : 'http://api.pt.huaml.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
@@ -15,11 +15,11 @@ function resolve(dir) {
  * **/
 let hostUrl = ``;
 if(process.env.NODE_ENV == 'development'){
-	hostUrl = `http://img.wixhb.com/`;
+	hostUrl = `http://img.hzghd.com/`;
 }else if(process.env.NODE_ENV == 'local'){
-	hostUrl = `http://img.wixhb.com/`;
+	hostUrl = `http://img.hzghd.com/`;
 }else{
-	hostUrl = `https://img.wixhb.com/`;
+	hostUrl = `https://img.hzghd.com/`;
 }
 
 const cdn = {