shish 4 лет назад
Родитель
Сommit
69e6510aa5
57 измененных файлов с 175 добавлено и 133 удалено
  1. 4 4
      ghs/vue.config.js
  2. 2 2
      ghsApp/dist/build/mp-weixin/admin/clear/customOrderItem.json
  3. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json
  4. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/module/operate.json
  5. 2 2
      ghsApp/dist/build/mp-weixin/components/app-coupon-sel.json
  6. 2 2
      ghsApp/dist/build/mp-weixin/components/app-img.json
  7. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-footer-cart.json
  8. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json
  9. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/fab.json
  10. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/selectList.json
  11. 0 0
      ghsApp/dist/build/mp-weixin/pagesClient/member/detail.js
  12. 0 0
      ghsApp/dist/build/mp-weixin/pagesClient/member/detail.wxml
  13. 9 9
      ghsApp/dist/build/mp-weixin/pagesClient/member/detail.wxss
  14. 0 0
      ghsApp/dist/build/mp-weixin/pagesOrder/refund.js
  15. 0 0
      ghsApp/dist/build/mp-weixin/pagesOrder/refund.wxml
  16. 1 1
      ghsApp/dist/build/mp-weixin/pagesOrder/refund.wxss
  17. 6 6
      ghsApp/src/ext.json
  18. 1 7
      ghsApp/src/manifest.json
  19. 6 6
      ghsApp/src/static/iconfont/iconfont.css
  20. 4 4
      hd/vue.config.js
  21. 2 2
      hdApp/dist/build/mp-weixin/admin/clear/orderItem.json
  22. 2 2
      hdApp/dist/build/mp-weixin/admin/coupon/components/selectCouponItem.json
  23. 2 2
      hdApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json
  24. 2 2
      hdApp/dist/build/mp-weixin/admin/home/components/plugin/timeaxis-item.json
  25. 2 2
      hdApp/dist/build/mp-weixin/admin/order/components/card-name.json
  26. 4 2
      hdApp/dist/build/mp-weixin/app.json
  27. 0 0
      hdApp/dist/build/mp-weixin/common/main.wxss
  28. 2 2
      hdApp/dist/build/mp-weixin/components/app-date-picker.json
  29. 2 2
      hdApp/dist/build/mp-weixin/components/kd_entrance.json
  30. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-close.json
  31. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-footer-cart.json
  32. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-goods-commodity-style.json
  33. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-search.json
  34. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-vip.json
  35. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/list-cell.json
  36. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/modal.json
  37. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/simple-address.json
  38. 6 6
      hdApp/dist/build/mp-weixin/ext.json
  39. 2 2
      hdApp/dist/build/mp-weixin/pagesInvite/inviteItem.json
  40. 1 1
      hdApp/dist/build/mp-weixin/pagesPurchase/common/vendor.js
  41. 0 0
      hdApp/dist/build/mp-weixin/pagesPurchase/purDetails.js
  42. 0 0
      hdApp/dist/build/mp-weixin/pagesPurchase/purDetails.wxml
  43. 0 0
      hdApp/dist/build/mp-weixin/pagesPurchase/purDetails.wxss
  44. 0 0
      hdApp/dist/build/mp-weixin/pagesPurchase/refundDetail.js
  45. 7 0
      hdApp/dist/build/mp-weixin/pagesPurchase/refundDetail.json
  46. 0 0
      hdApp/dist/build/mp-weixin/pagesPurchase/refundDetail.wxml
  47. 0 0
      hdApp/dist/build/mp-weixin/pagesPurchase/refundDetail.wxss
  48. 34 2
      hdApp/dist/build/mp-weixin/project.config.json
  49. 7 0
      hdApp/dist/build/mp-weixin/sitemap.json
  50. 6 6
      hdApp/dist/build/mp-weixin/static/iconfont/iconfont.css
  51. 6 6
      hdApp/src/ext.json
  52. 1 1
      hdApp/src/manifest.json
  53. 6 6
      hdApp/src/static/iconfont/iconfont.css
  54. 5 5
      mallApp/src/ext.json
  55. 1 1
      mallApp/src/manifest.json
  56. 6 6
      mallApp/src/static/iconfont/iconfont.css
  57. 4 4
      pt/vue.config.js

+ 4 - 4
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 = {

+ 2 - 2
ghsApp/dist/build/mp-weixin/admin/clear/customOrderItem.json

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

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

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

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

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/app-coupon-sel.json

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/app-img.json

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

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

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/fab.json

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/selectList.json

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

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesClient/member/detail.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesClient/member/detail.wxml


+ 9 - 9
ghsApp/dist/build/mp-weixin/pagesClient/member/detail.wxss

@@ -1,9 +1,9 @@
-.module-com.data-v-d04dd782{margin:0 30rpx 20rpx;padding:20rpx;background-color:#fff;border-radius:10rpx;position:relative;z-index:10}.user-info.data-v-d04dd782{padding:60rpx 20rpx 60rpx;position:relative;top:51rpx}.user-info .user-info_top.data-v-d04dd782{position:relative;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;height:100rpx}.user-info .user-info_top .user-info_lf.data-v-d04dd782{position:relative;padding-left:10rpx;-webkit-box-flex:1;-webkit-flex:1;flex:1}.user-info .user-info_top .user-info_lf .avatar.data-v-d04dd782{position:absolute;left:10rpx;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.user-info .user-info_top .user-info_lf .dec-bx.data-v-d04dd782{padding-left:130rpx}.user-info .user-info_top .user-info_lf .dec-bx > view.data-v-d04dd782:nth-child(1){color:#333;font-size:36rpx;margin-bottom:3rpx}.user-info .user-info_top .user-info_lf .dec-bx > view.data-v-d04dd782:nth-child(2){color:#666;font-size:30rpx}.user-info .user-info_top .already-shop.data-v-d04dd782{color:#09bb07;font-size:30rpx;font-weight:400}.user-info .user-info_top .already-shop > .iconfont.data-v-d04dd782{padding-right:8rpx;font-size:32rpx}.invite-bt.data-v-d04dd782{color:#fff;font-size:26rpx;font-weight:400;width:140rpx;height:50rpx;line-height:50rpx;background-color:#3385ff;text-align:center;border-radius:25rpx;border:1rpx solid #ddd;padding:0;-webkit-user-select:none;user-select:none;outline:none}.invite-bt.white.data-v-d04dd782{background-color:#fff;color:#666}.total-wrap .total-tit.data-v-d04dd782,
-.order-wrap .total-tit.data-v-d04dd782{padding:18rpx 0 18rpx 20rpx;border-bottom:1rpx solid #eee;font-weight:600;font-size:24rpx;color:#333}.total-wrap .total-blo.data-v-d04dd782,
-.order-wrap .total-blo.data-v-d04dd782{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-flex-wrap:wrap;flex-wrap:wrap;padding:30rpx 0 0rpx}.total-wrap .total-blo .total-list.data-v-d04dd782,
-.order-wrap .total-blo .total-list.data-v-d04dd782{width:33%;text-align:center;margin:20rpx 0rpx;border-right:1rpx solid #eee}.total-wrap .total-blo .total-list .app-color-3.data-v-d04dd782,
-.order-wrap .total-blo .total-list .app-color-3.data-v-d04dd782{font-size:24rpx}.total-wrap .total-blo .total-list .list-num.data-v-d04dd782,
-.order-wrap .total-blo .total-list .list-num.data-v-d04dd782{margin-top:8rpx;margin-bottom:8rpx;font-size:36rpx;font-weight:700}.total-wrap .total-blo .total-list .list-num.color-blue.data-v-d04dd782,
-.order-wrap .total-blo .total-list .list-num.color-blue.data-v-d04dd782{color:#3385ff}.total-wrap .total-blo .total-list.data-v-d04dd782:nth-child(3n),
-.order-wrap .total-blo .total-list.data-v-d04dd782:nth-child(3n){border-right:none}.total-wrap .total-blo .total-list.data-v-d04dd782:nth-child(n + 4),
-.order-wrap .total-blo .total-list.data-v-d04dd782:nth-child(n + 4){padding-bottom:0}.user-address_bx.data-v-d04dd782{margin-top:70rpx;padding:20rpx 0}.user-address_bx .address-tit.data-v-d04dd782{color:#999;font-size:24rpx;font-weight:600;padding:10rpx 0 20rpx 20rpx;border-bottom:1rpx solid #eee}.user-address_bx .address-des_bx.data-v-d04dd782{display:-webkit-box;display:-webkit-flex;display:flex;padding:20rpx 10rpx 30rpx 20rpx}.user-address_bx .address-des_bx > view.data-v-d04dd782:nth-child(1){-webkit-box-flex:1;-webkit-flex:1;flex:1;margin-top:10rpx}.user-address_bx .address-des_bx > view:nth-child(1) > view.data-v-d04dd782:nth-child(1){color:#333;font-size:28rpx;font-weight:700;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.user-address_bx .address-des_bx > view:nth-child(1) > view:nth-child(1) .admin-button-com.data-v-d04dd782{margin-left:10rpx;border-radius:25rpx}.user-address_bx .address-des_bx > view:nth-child(1) > view.data-v-d04dd782:nth-child(2){color:#666;font-size:28rpx;font-weight:400;margin-top:20rpx}.user-address_bx .address-des_bx > view.data-v-d04dd782:nth-child(2){display:-webkit-box;display:-webkit-flex;display:flex}.user-address_bx .address-des_bx > view:nth-child(2) .icondianhua1.data-v-d04dd782{font-size:44rpx;color:#3385ff;margin-left:10rpx}.user-open_bx.data-v-d04dd782{margin-top:20rpx;padding:0}.user-open_bx .switch_bx.data-v-d04dd782{-webkit-box-flex:1;-webkit-flex:1;flex:1;text-align:right}.user-open_bx .switch_bx > text.data-v-d04dd782{color:#999;font-size:28rpx;display:inline-block;margin-right:22rpx}
+.module-com.data-v-6bda0feb{margin:0 30rpx 20rpx;padding:20rpx;background-color:#fff;border-radius:10rpx;position:relative;z-index:10}.user-info.data-v-6bda0feb{padding:60rpx 20rpx 60rpx;position:relative;top:51rpx}.user-info .user-info_top.data-v-6bda0feb{position:relative;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;height:100rpx}.user-info .user-info_top .user-info_lf.data-v-6bda0feb{position:relative;padding-left:10rpx;-webkit-box-flex:1;-webkit-flex:1;flex:1}.user-info .user-info_top .user-info_lf .avatar.data-v-6bda0feb{position:absolute;left:10rpx;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.user-info .user-info_top .user-info_lf .dec-bx.data-v-6bda0feb{padding-left:130rpx}.user-info .user-info_top .user-info_lf .dec-bx > view.data-v-6bda0feb:nth-child(1){color:#333;font-size:36rpx;margin-bottom:3rpx}.user-info .user-info_top .user-info_lf .dec-bx > view.data-v-6bda0feb:nth-child(2){color:#666;font-size:30rpx}.user-info .user-info_top .already-shop.data-v-6bda0feb{color:#09bb07;font-size:30rpx;font-weight:400}.user-info .user-info_top .already-shop > .iconfont.data-v-6bda0feb{padding-right:8rpx;font-size:32rpx}.invite-bt.data-v-6bda0feb{color:#fff;font-size:26rpx;font-weight:400;width:140rpx;height:50rpx;line-height:50rpx;background-color:#3385ff;text-align:center;border-radius:25rpx;border:1rpx solid #ddd;padding:0;-webkit-user-select:none;user-select:none;outline:none}.invite-bt.white.data-v-6bda0feb{background-color:#fff;color:#666}.total-wrap .total-tit.data-v-6bda0feb,
+.order-wrap .total-tit.data-v-6bda0feb{padding:18rpx 0 18rpx 20rpx;border-bottom:1rpx solid #eee;font-weight:600;font-size:24rpx;color:#333}.total-wrap .total-blo.data-v-6bda0feb,
+.order-wrap .total-blo.data-v-6bda0feb{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-flex-wrap:wrap;flex-wrap:wrap;padding:30rpx 0 0rpx}.total-wrap .total-blo .total-list.data-v-6bda0feb,
+.order-wrap .total-blo .total-list.data-v-6bda0feb{width:33%;text-align:center;margin:20rpx 0rpx;border-right:1rpx solid #eee}.total-wrap .total-blo .total-list .app-color-3.data-v-6bda0feb,
+.order-wrap .total-blo .total-list .app-color-3.data-v-6bda0feb{font-size:24rpx}.total-wrap .total-blo .total-list .list-num.data-v-6bda0feb,
+.order-wrap .total-blo .total-list .list-num.data-v-6bda0feb{margin-top:8rpx;margin-bottom:8rpx;font-size:36rpx;font-weight:700}.total-wrap .total-blo .total-list .list-num.color-blue.data-v-6bda0feb,
+.order-wrap .total-blo .total-list .list-num.color-blue.data-v-6bda0feb{color:#3385ff}.total-wrap .total-blo .total-list.data-v-6bda0feb:nth-child(3n),
+.order-wrap .total-blo .total-list.data-v-6bda0feb:nth-child(3n){border-right:none}.total-wrap .total-blo .total-list.data-v-6bda0feb:nth-child(n + 4),
+.order-wrap .total-blo .total-list.data-v-6bda0feb:nth-child(n + 4){padding-bottom:0}.user-address_bx.data-v-6bda0feb{margin-top:70rpx;padding:20rpx 0}.user-address_bx .address-tit.data-v-6bda0feb{color:#999;font-size:24rpx;font-weight:600;padding:10rpx 0 20rpx 20rpx;border-bottom:1rpx solid #eee}.user-address_bx .address-des_bx.data-v-6bda0feb{display:-webkit-box;display:-webkit-flex;display:flex;padding:20rpx 10rpx 30rpx 20rpx}.user-address_bx .address-des_bx > view.data-v-6bda0feb:nth-child(1){-webkit-box-flex:1;-webkit-flex:1;flex:1;margin-top:10rpx}.user-address_bx .address-des_bx > view:nth-child(1) > view.data-v-6bda0feb:nth-child(1){color:#333;font-size:28rpx;font-weight:700;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.user-address_bx .address-des_bx > view:nth-child(1) > view:nth-child(1) .admin-button-com.data-v-6bda0feb{margin-left:10rpx;border-radius:25rpx}.user-address_bx .address-des_bx > view:nth-child(1) > view.data-v-6bda0feb:nth-child(2){color:#666;font-size:28rpx;font-weight:400;margin-top:20rpx}.user-address_bx .address-des_bx > view.data-v-6bda0feb:nth-child(2){display:-webkit-box;display:-webkit-flex;display:flex}.user-address_bx .address-des_bx > view:nth-child(2) .icondianhua1.data-v-6bda0feb{font-size:44rpx;color:#3385ff;margin-left:10rpx}.user-open_bx.data-v-6bda0feb{margin-top:20rpx;padding:0}.user-open_bx .switch_bx.data-v-6bda0feb{-webkit-box-flex:1;-webkit-flex:1;flex:1;text-align:right}.user-open_bx .switch_bx > text.data-v-6bda0feb{color:#999;font-size:28rpx;display:inline-block;margin-right:22rpx}

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesOrder/refund.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesOrder/refund.wxml


+ 1 - 1
ghsApp/dist/build/mp-weixin/pagesOrder/refund.wxss

@@ -1 +1 @@
-.app-content.data-v-c4a89376{height:calc(100vh - 30rpx * 2);padding:30rpx;background:#fff;font-size:30rpx}.app-content .radioBtn.data-v-c4a89376{width:30rpx;height:30rpx;margin-right:10rpx;border:1rpx solid #ddd;border-radius:50%}.app-content .radioBtn.active.data-v-c4a89376{position:relative;border:1rpx solid #3385ff}.app-content .radioBtn.active.data-v-c4a89376:after{content:"";position:absolute;width:18rpx;height:18rpx;background:#3385ff;border-radius:50%}.app-content .refund-item-list.data-v-c4a89376{display:-webkit-box;display:-webkit-flex;display:flex;padding-bottom:30rpx;border-bottom:1rpx solid #ddd}.app-content .refund-item-list .refund-label.data-v-c4a89376{width:200rpx}.app-content .refund-item-list .refund-label text.data-v-c4a89376{color:red}.app-content .refund-item-list .list.data-v-c4a89376{margin-bottom:10rpx}.app-content .refund-item-list .list .list-title.data-v-c4a89376{height:60rpx;padding-bottom:20rpx}.app-content .refund-item-list .list .list-val input.data-v-c4a89376{width:150rpx;border:1rpx solid #ddd}.app-content .refund-item-list .list .list-val text.data-v-c4a89376{padding:0 30rpx}.app-content .refund-item.data-v-c4a89376{display:-webkit-box;display:-webkit-flex;display:flex;padding:30rpx 0}.app-content .refund-item .refund-label.data-v-c4a89376{width:200rpx}.app-content .refund-item .refund-label text.data-v-c4a89376{color:red}.app-content .refund-item input.data-v-c4a89376{border:1rpx solid #ddd}.app-content .refund-item textarea.data-v-c4a89376{width:calc(100% - 210rpx);border:1rpx solid #ddd}.app-content .btn-box .btn.data-v-c4a89376{width:200rpx;height:60rpx;border:1rpx solid #666;border-radius:10rpx}.app-content .btn-box .btn.active.data-v-c4a89376{background:#3385ff;color:#fff;border:1rpx solid #3385ff}
+.app-content.data-v-118b0440{height:calc(100vh - 30rpx * 2);padding:30rpx;background:#fff;font-size:30rpx}.app-content .radioBtn.data-v-118b0440{width:30rpx;height:30rpx;margin-right:10rpx;border:1rpx solid #ddd;border-radius:50%}.app-content .radioBtn.active.data-v-118b0440{position:relative;border:1rpx solid #3385ff}.app-content .radioBtn.active.data-v-118b0440:after{content:"";position:absolute;width:18rpx;height:18rpx;background:#3385ff;border-radius:50%}.app-content .refund-item-list.data-v-118b0440{display:-webkit-box;display:-webkit-flex;display:flex;padding-bottom:30rpx;border-bottom:1rpx solid #ddd}.app-content .refund-item-list .refund-label.data-v-118b0440{width:200rpx}.app-content .refund-item-list .refund-label text.data-v-118b0440{color:red}.app-content .refund-item-list .list.data-v-118b0440{margin-bottom:10rpx}.app-content .refund-item-list .list .list-title.data-v-118b0440{height:60rpx;padding-bottom:20rpx}.app-content .refund-item-list .list .list-val input.data-v-118b0440{width:150rpx;border:1rpx solid #ddd}.app-content .refund-item-list .list .list-val text.data-v-118b0440{padding:0 30rpx}.app-content .refund-item.data-v-118b0440{display:-webkit-box;display:-webkit-flex;display:flex;padding:30rpx 0}.app-content .refund-item .refund-label.data-v-118b0440{width:200rpx}.app-content .refund-item .refund-label text.data-v-118b0440{color:red}.app-content .refund-item input.data-v-118b0440{border:1rpx solid #ddd}.app-content .refund-item textarea.data-v-118b0440{width:calc(100% - 210rpx);border:1rpx solid #ddd}.app-content .btn-box .btn.data-v-118b0440{width:200rpx;height:60rpx;border:1rpx solid #666;border-radius:10rpx}.app-content .btn-box .btn.active.data-v-118b0440{background:#3385ff;color:#fff;border:1rpx solid #3385ff}

+ 6 - 6
ghsApp/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wxcf32b3f0684c2433",
+  "extAppid": "wx21b7c3ef12082099",
   "directCommit": false,
   "ext": {
-    "account": 12358,
-    "apiHost": "https://api.shop.wixhb.com",
-    "socketApiHost": "api.shop.wixhb.com",
-    "imgHost": "https://img.wixhb.com",
-    "name":"销花宝"
+    "account": 12362,
+    "apiHost": "https://api.shop.hzghd.com",
+    "socketApiHost": "api.shop.hzghd.com",
+    "imgHost": "https://img.hzghd.com",
+    "name":"花掌柜"
   }
 }

+ 1 - 7
ghsApp/src/manifest.json

@@ -83,21 +83,15 @@
     "quickapp" : {},
     /* 小程序特有相关 线上(销花宝) wxcf32b3f0684c2433 开发(花掌柜) wx21b7c3ef12082099 */
     "mp-weixin" : {
-        "appid" : "wxcf32b3f0684c2433",
+        "appid" : "wx21b7c3ef12082099",
         "setting" : {
             "urlCheck" : false
         },
-		"optimization" : {
-			"subPackages" : true
-		},
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
                 "desc" : "请点击确定"
             }
-        },
-        "optimization": {  
-            "subPackages": true  
         }
     },
     "mp-alipay" : {

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

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

+ 4 - 4
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: {

+ 2 - 2
hdApp/dist/build/mp-weixin/admin/clear/orderItem.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/admin/coupon/components/selectCouponItem.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/admin/home/components/plugin/timeaxis-item.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/admin/order/components/card-name.json

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

+ 4 - 2
hdApp/dist/build/mp-weixin/app.json

@@ -272,7 +272,8 @@
         "gatherResult",
         "purDetails",
         "info",
-        "xj"
+        "xj",
+        "refundDetail"
       ]
     },
     {
@@ -362,5 +363,6 @@
     "t-tr": "/components/plugin/t-table/t-tr",
     "t-th": "/components/plugin/t-table/t-th",
     "t-td": "/components/plugin/t-table/t-td"
-  }
+  },
+  "sitemapLocation": "sitemap.json"
 }

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/build/mp-weixin/common/main.wxss


+ 2 - 2
hdApp/dist/build/mp-weixin/components/app-date-picker.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/components/kd_entrance.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/components/module/app-close.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/components/module/app-footer-cart.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/components/module/app-goods-commodity-style.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/components/module/app-search.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/components/module/app-vip.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/components/plugin/list-cell.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/components/plugin/modal.json

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

+ 2 - 2
hdApp/dist/build/mp-weixin/components/plugin/simple-address.json

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

+ 6 - 6
hdApp/dist/build/mp-weixin/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":"花惠宝"
   }
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/pagesInvite/inviteItem.json

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

+ 1 - 1
hdApp/dist/build/mp-weixin/pagesPurchase/common/vendor.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesPurchase/common/vendor"],{"0793":function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.getGhsXj=void 0;var n=o(a("14bf"));function o(e){return e&&e.__esModule?e:{default:e}}var s=function(e){return n.default.get("/shop-ext/get-ghs-xj",e)};t.getGhsXj=s},"95c8":function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.adminSetPayPassword=void 0;var n=o(a("14bf"));function o(e){return e&&e.__esModule?e:{default:e}}var s=function(e){return n.default.get("/admin/set-pay-password",e)};t.adminSetPayPassword=s}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesPurchase/common/vendor"],{"0793":function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.getGhsXj=void 0;var r=u(n("14bf"));function u(e){return e&&e.__esModule?e:{default:e}}var a=function(e){return r.default.get("/shop-ext/get-ghs-xj",e)};t.getGhsXj=a},"7a55":function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.getRefundData=void 0;var r=a(n("4838")),u=a(n("14bf"));function a(e){return e&&e.__esModule?e:{default:e}}function o(e,t,n,r,u,a,o){try{var i=e[a](o),s=i.value}catch(c){return void n(c)}i.done?t(s):Promise.resolve(s).then(r,u)}function i(e){return function(){var t=this,n=arguments;return new Promise((function(r,u){var a=e.apply(t,n);function i(e){o(a,r,u,i,s,"next",e)}function s(e){o(a,r,u,i,s,"throw",e)}i(void 0)}))}}var s=function(){var e=i(r.default.mark((function e(t){return r.default.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.abrupt("return",u.default.get("/cg-refund/get-refund-data",t));case 1:case"end":return e.stop()}}),e)})));return function(t){return e.apply(this,arguments)}}();t.getRefundData=s},"95c8":function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.adminSetPayPassword=void 0;var r=u(n("14bf"));function u(e){return e&&e.__esModule?e:{default:e}}var a=function(e){return r.default.get("/admin/set-pay-password",e)};t.adminSetPayPassword=a}}]);

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/build/mp-weixin/pagesPurchase/purDetails.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/build/mp-weixin/pagesPurchase/purDetails.wxml


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/build/mp-weixin/pagesPurchase/purDetails.wxss


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/build/mp-weixin/pagesPurchase/refundDetail.js


+ 7 - 0
hdApp/dist/build/mp-weixin/pagesPurchase/refundDetail.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "退款详情",
+  "enablePullDownRefresh": true,
+  "usingComponents": {
+    "tui-list-cell": "/components/plugin/list-cell"
+  }
+}

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/build/mp-weixin/pagesPurchase/refundDetail.wxml


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/build/mp-weixin/pagesPurchase/refundDetail.wxss


+ 34 - 2
hdApp/dist/build/mp-weixin/project.config.json

@@ -5,11 +5,43 @@
   },
   "setting": {
     "urlCheck": false,
-    "es6": true
+    "es6": true,
+    "enhance": true,
+    "postcss": true,
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": false,
+    "coverView": true,
+    "nodeModules": false,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "uglifyFileName": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "lazyloadPlaceholderEnable": false,
+    "useMultiFrameRuntime": true,
+    "useApiHook": true,
+    "useApiHostProcess": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "enableEngineNative": false,
+    "useIsolateContext": true,
+    "userConfirmedBundleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true,
+    "showES6CompileOption": false
   },
   "compileType": "miniprogram",
   "libVersion": "",
-  "projectname": "零售",
+  "appid": "wx0d42f5f1dcb3a370",
+  "projectname": "%E9%9B%B6%E5%94%AE",
   "condition": {
     "search": {
       "list": []

+ 7 - 0
hdApp/dist/build/mp-weixin/sitemap.json

@@ -0,0 +1,7 @@
+{
+  "desc": "关于本文件的更多信息,请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
+  "rules": [{
+  "action": "allow",
+  "page": "*"
+  }]
+}

+ 6 - 6
hdApp/dist/build/mp-weixin/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 {

+ 6 - 6
hdApp/src/ext.json

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

+ 1 - 1
hdApp/src/manifest.json

@@ -84,7 +84,7 @@
     "quickapp" : {},
     /* 小程序特有相关 线上(花惠宝) wx0d42f5f1dcb3a370 开发(花美玲) wxe4675bab299a52f7 */
     "mp-weixin" : {
-        "appid" : "wx0d42f5f1dcb3a370",
+        "appid" : "wxe4675bab299a52f7",
         "setting" : {
             "urlCheck" : false
         },

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

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

+ 5 - 5
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":"花卉"
   }
 }

+ 1 - 1
mallApp/src/manifest.json

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

+ 6 - 6
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 {

+ 4 - 4
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 = {

Некоторые файлы не были показаны из-за большого количества измененных файлов