优化

ghs/vue.config.js

@@ -2,14 +2,14 @@ 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';
+//http和https切换请修改这里，同步修改下面图片的host，修改后需要重新运行npm run serve shish 2021.4.12
+const proxyTarget = 'https://api.shop.hzghd.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
 }
 
-let hostUrl = 'https://img.wixhb.com/';
+let hostUrl = 'https://img.hzghd.com/';
 
 const cdn = {
 	dev: {

ghsApp/src/admin/billing/result.vue

@@ -48,6 +48,7 @@ import { changeHalf } from "@/api/item"
 import { giveItem } from "@/api/order-item"
 import ModalModule from "@/components/plugin/modal"
 import { CURRENT_ENV } from "@/config"
+import { buildOrderShareTitle } from '@/utils/orderShare'
 export default {
   name: "result",
   components: {
@@ -171,14 +172,8 @@ export default {
         if(this.detailInfo.customName && !this.$util.isEmpty(this.detailInfo.customName)) {
           this.customName = this.detailInfo.customName
         }
-        let actPrice = this.detailInfo.actPrice ? parseFloat(this.detailInfo.actPrice) : 0
-        this.title = this.customName+' '+this.detailInfo.addTime.substr(5,11)+' ¥'+actPrice
-        if(this.detailInfo.payTime!='0000-00-00 00:00:00'){
-          this.title = this.customName+' '+this.detailInfo.payTime.substr(5,11)+' ¥'+actPrice
-        }
-        if(this.detailInfo.tkPrice && Number(this.detailInfo.tkPrice)>0){
-          this.title = this.title+' 已退¥'+parseFloat(this.detailInfo.tkPrice)
-		    }
+        // 分享标题日期用发货日，与订单列表 buildOrderShareTitle 一致
+        this.title = buildOrderShareTitle(this.detailInfo)
       }
     },
     //发货

ghsApp/src/admin/billing/toPay.vue

@@ -68,6 +68,7 @@
 import { mapGetters } from "vuex";
 import { IMGHOST } from '@/config'
 import { cancel,debtPay,getDetail,codePay,codePayCheck,codePayVerify} from "@/api/order";
+import { buildOrderShareTitle } from '@/utils/orderShare'
 export default {
   name: "toPay",
   components: {
@@ -112,15 +113,8 @@ export default {
         if(res.code == 1){
           this.orderInfo = res.data
 
-          let customName = this.orderInfo.customName ? this.orderInfo.customName : ''
-          let actPrice = this.orderInfo.actPrice ? parseFloat(this.orderInfo.actPrice) : 0
-          this.title = customName+' '+this.orderInfo.addTime.substr(5,11)+' ¥'+actPrice
-          if(this.orderInfo.payTime!='0000-00-00 00:00:00'){
-            this.title = customName+' '+this.orderInfo.payTime.substr(5,11)+' ¥'+actPrice
-          }
-          if(this.orderInfo.tkPrice && Number(this.orderInfo.tkPrice)>0){
-            this.title = this.title+' 已退¥'+parseFloat(this.orderInfo.tkPrice)
-          }
+          // 分享标题日期用发货日，与订单列表 buildOrderShareTitle 一致
+          this.title = buildOrderShareTitle(this.orderInfo)
           if(this.orderInfo.status == 1){
             this.title = this.title+' 点击付款，10分钟后失效'
           }

ghsApp/src/config.js

@@ -1,5 +1,5 @@
 export const ProjectName = 'ghs'
-export const APIHOST = 'https://api.shop.wixhb.com'
-export const IMGHOST = 'https://img.wixhb.com'
-export const CURRENT_ENV = 'production'
+export const APIHOST = 'https://api.shop.hzghd.com'
+export const IMGHOST = 'https://img.hzghd.com'
+export const CURRENT_ENV = 'dev'
 export const APP_VERSION = '1.2.90'

ghsApp/src/manifest.json

@@ -221,7 +221,7 @@
     "quickapp" : {},
     /* 小程序特有相关 线上（销花宝） wxcf32b3f0684c2433 开发（花掌柜） wx21b7c3ef12082099 */
     "mp-weixin" : {
-        "appid" : "wxcf32b3f0684c2433",
+        "appid" : "wx21b7c3ef12082099",
         "setting" : {
             "urlCheck" : false,
             "minified" : true
@@ -235,7 +235,7 @@
         "optimization" : {
             "subPackages" : true
         },
-        "lazyCodeLoading" : "requiredComponents",
+        "lazyCodeLoading":"requiredComponents",
         "uniStatistics" : {
             "enable" : false
         },
@@ -279,7 +279,7 @@
             "port" : 81,
             "proxy" : {
                 "/api" : {
-                    "target" : "http://api.shop.wixhb.com",
+                    "target" : "http://api.shop.hzghd.com",
                     "secure" : false,
                     "changeOrigin" : true,
                     "pathRewrite" : {

ghsApp/src/pagesOrder/detail.vue

@@ -714,6 +714,7 @@ import MxDatePicker from '@/components/mx-datepicker/mx-datepicker.vue';
 import { getCgExpressTrack,expressDetail } from "@/api/express"
 import { cancelCallExpressOrder,mockNotify } from '@/api/shop/shop-express'
 import { cancelDeliveryOrder, getCancelReason, addTip as addTipApi } from '@/api/express/delivery'
+import { buildOrderShareTitle } from '@/utils/orderShare'
 export default {
 	name: "orderDetail",
 	components: {
@@ -1831,15 +1832,8 @@ export default {
 					id: this.option.id
 				});
 				this.detailInfo = res.data;
-				let customName = this.detailInfo.customName ? this.detailInfo.customName : ''
-				let actPrice = this.detailInfo.actPrice ? parseFloat(this.detailInfo.actPrice) : 0
-				this.title = customName+' '+this.detailInfo.addTime.substr(5,11)+' ¥'+actPrice
-				if(this.detailInfo.payTime!='0000-00-00 00:00:00'){
-					this.title = customName+' '+this.detailInfo.payTime.substr(5,11)+' ¥'+actPrice
-				}
-				if(this.detailInfo.tkPrice && Number(this.detailInfo.tkPrice)>0){
-					this.title = this.title+' 已退¥'+parseFloat(this.detailInfo.tkPrice)
-				}
+				// 分享标题日期用发货日，与订单列表 buildOrderShareTitle 一致
+				this.title = buildOrderShareTitle(this.detailInfo)
 				if(this.detailInfo.status == 1){
 					this.title = this.title+' 点击付款，10分钟后失效'
 				}

ghsApp/src/utils/orderShare.js

@@ -18,17 +18,36 @@ export function getCgSalt(info) {
   return info.cgSalt || (info.cgInfo && info.cgInfo.salt) || ''
 }
 
-/** 单条订单分享标题（与详情页一致） */
+/**
+ * 分享卡片用的日期文案（月日时分）。
+ * 花店收到分享认的是货哪天走，取 sendTime；空发货日才回退开单日，不再用 payTime。
+ */
+export function getOrderShareDateText(info) {
+  if (!info) {
+    return ''
+  }
+  const send = info.sendTime
+  if (send && send.indexOf('0000-00-00') < 0) {
+    return send.substr(5, 11)
+  }
+  if (info.addTime) {
+    return info.addTime.substr(5, 11)
+  }
+  return ''
+}
+
+/** 单条订单分享标题：客户名 + 发货日期 + 金额（列表 / 详情 / 付款页共用） */
 export function buildOrderShareTitle(info) {
-  if (!info || !info.addTime) {
+  if (!info) {
+    return '订单'
+  }
+  const dateText = getOrderShareDateText(info)
+  if (!dateText) {
     return '订单'
   }
   const actPrice = info.actPrice ? parseFloat(info.actPrice) : 0
   const customName = info.customName ? info.customName : ''
-  let title = customName + ' ' + info.addTime.substr(5, 11) + ' ¥' + actPrice
-  if (info.payTime != '0000-00-00 00:00:00') {
-    title = customName + ' ' + info.payTime.substr(5, 11) + ' ¥' + actPrice
-  }
+  let title = customName + ' ' + dateText + ' ¥' + actPrice
   // 已退 = 当天售后 tkPrice + 跨天售后 nextDayTkPrice
   const dayTk = Number(info.tkPrice) || 0
   const nextTk = Number(info.nextDayTkPrice) || 0

ghsPad/src/config.js

@@ -1,4 +1,4 @@
-export const ProjectName = 'ghsPad'
-export const APIHOST = 'https://api.shop.wixhb.com'
-export const IMGHOST = 'https://img.wixhb.com'
-export const CURRENT_ENV = 'production'
+export const ProjectName = 'store'
+export const APIHOST = 'https://api.shop.hzghd.com'
+export const IMGHOST = 'https://img.hzghd.com'
+export const CURRENT_ENV = 'dev'

ghsPad/src/manifest.json

@@ -45,7 +45,7 @@
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册，以便支持您修改头像、门店图片或花材图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限，以便支持您直接拍照上传头像、门店图片或花材图片"
                 },
-				"idfa" : false
+                "idfa" : false            
             },
             /* SDK配置 */
             "sdkConfigs" : {
@@ -133,13 +133,10 @@
     "quickapp" : {},
     /* 小程序特有相关 线上（销花宝） wxcf32b3f0684c2433 开发（花掌柜） wx21b7c3ef12082099 */
     "mp-weixin" : {
-        "appid" : "wxcf32b3f0684c2433",
+        "appid" : "wx21b7c3ef12082099",
         "setting" : {
             "urlCheck" : false
         },
-        "optimization" : {
-            "subPackages" : true
-        },
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
@@ -174,7 +171,7 @@
             "port" : 81,
             "proxy" : {
                 "/api" : {
-                    "target" : "http://api.shop.wixhb.com",
+                    "target" : "http://api.shop.hzghd.com",
                     "secure" : false,
                     "changeOrigin" : true,
                     "pathRewrite" : {

hd/vue.config.js

@@ -3,13 +3,13 @@ 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 = 'https://api.shop.huaml.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
 }
 
-let hostUrl = 'https://img.huahb.cn/';
+let hostUrl = 'https://img.huaml.com/';
 
 const cdn = {
 	dev: {

hdApp/src/config.js

@@ -1,7 +1,7 @@
 export const ProjectName = 'hd'
-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'
-export const WSSHOST = 'wss://chat.shop.huahb.cn'
+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 WSSHOST = 'wss://chat.shop.huaml.com'
 export const APP_VERSION = '2.3.7'

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":"花美玲"
   }
 }

hdApp/src/manifest.json

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

hdApp/src/pagesPurchase/orderItem.vue

@@ -25,7 +25,7 @@
         <view class="info-row">
           <text class="info-label"> 开单：</text>
           <text class="info-value">{{ info.addTime ? info.addTime.substr(5, 11) : '' }}</text>
-          <!-- 发货日与开单日不是同一天才展示，贴本行右侧，对齐 ghsApp 订单列表 -->
+          <!-- 发货日与开单日不是同一天才展示；绝对定位贴卡片右缘，红色强调跨天 -->
           <text v-if="showSendDate" class="extra-date">发货日期 {{ info.sendTime.substr(5, 11) }}</text>
         </view>
         <!-- 账单日被改过（与开单日不同）才占一行；同一天再展示等于重复 -->
@@ -211,10 +211,12 @@ export default {
         color: #333333;
       }
     }
-    .send-date {
+    /* 相对 item-main 贴卡片右缘，避免被价格列挤回开单旁边 */
+    .extra-date {
       position: absolute;
+      top: 12upx;
       right: 20upx;
-      color: #a29696;
+      color: red;
       font-size: 26upx;
       white-space: nowrap;
     }

hdApp/src/pagesPurchase/shopping.vue

@@ -122,9 +122,9 @@ export default {
       ghsName:'',
       searchTimeType: 0,
       timeTypeOptions: [
-        { label: '开单', value: 0 },
-        { label: '发货', value: 2 },
-        { label: '账单', value: 1 }
+        { label: '开单日期', value: 0 },
+        { label: '发货日期', value: 2 },
+        { label: '账单日期', value: 1 }
       ]
     }
   },

hdApp/src/static/iconfont/iconfont.css

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

hdPad/src/config.js

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

hdPad/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":"花美玲"
   }
 }

hdPad/src/static/iconfont/iconfont.css

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

hdh5/config.js

@@ -1,3 +1,3 @@
 // API 配置
-export const APIHOST = 'https://api.shop.huahb.cn'
-export const IMGHOST = 'https://img.huahb.cn'
+export const APIHOST = 'https://api.shop.huaml.com'
+export const IMGHOST = 'https://img.huaml.com'

mallApp/src/config.js

@@ -1,4 +1,4 @@
 export const ProjectName = 'mall'
-export const CURRENT_ENV = 'production'
-export const APIHOST = 'https://api.shop.zhiguanhua.cn'
-export const WSSHOST = 'wss://chat.shop.huahb.cn'
+export const CURRENT_ENV = 'dev'
+export const APIHOST = 'https://api.shop.theflorist.cn'
+export const WSSHOST = 'wss://chat.shop.huaml.com'

mallApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "商城",
     "appid" : "__UNI__19572D0",
     "description" : "花店商城",
-    "versionName" : "1.0.10",
-    "versionCode" : "1010",
+    "versionName" : "1.0.12",
+    "versionCode" : "1012",
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -38,14 +38,12 @@
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册，以便支持您修改头像、门店图片或花材图片",
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册，以便支持您修改头像、门店图片或花材图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限，以便支持您直接拍照上传头像、门店图片或花材图片"
-				},
-				"idfa" : false
+                },
+                "idfa" : false            
             },
             /* SDK配置 */
             "sdkConfigs" : {
-                "speech" : {
-                    
-                }
+                "speech" : {}
             },
             "orientation" : [ "portrait-primary" ]
         },
@@ -57,13 +55,17 @@
     "quickapp" : {},
     /* 小程序特有相关 线上（花卉宝） wx99a1dfc4171efb42 开发（中花卉） wxe41bd5816affd0ba */
     "mp-weixin" : {
-        "appid" : "wx99a1dfc4171efb42",
+        "appid" : "wxe41bd5816affd0ba",
         "setting" : {
             "urlCheck" : false
         },
+        "optimization" : {
+            "subPackages" : true
+        },
         "usingComponents" : true,
-        "permission" : {},
-        "lazyCodeLoading" : "requiredComponents",
+        "permission" : {
+        },
+        "lazyCodeLoading":"requiredComponents",
         "uniStatistics" : {
             "enable" : false
         }
@@ -93,7 +95,7 @@
             "base" : "/"
         },
         "async": {
-            "timeout": 20000
+            "timeout": 200000
         },
         "optimization": {
             "treeShaking": {
@@ -123,8 +125,7 @@
         "uniStatistics" : {
             "enable" : false
         }
-    }
-    ,
+    },
     "uniStatistics" : {
         "version" : "2",
         "enable" : false

mallApp/src/static/iconfont/iconfont.css

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

pt/vue.config.js

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