入库时间

ghs/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.wixhb.com';
+const proxyTarget = 'http://api.shop.hzghd.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
 }
 
-let hostUrl = 'https://img.wixhb.com/';
+let hostUrl = 'http://img.hzghd.com/';
 
 const cdn = {
 	dev: {

ghsApp/src/api/purchase/index.js

@@ -1,5 +1,9 @@
 import https from "@/plugins/luch-request_0.0.7/request";
 
+export const modifyEntryTime = data => {
+	return https.get("/purchase-order/modify-entry-time", data);
+};
+
 export const batchConfirm = data => {
 	return https.post("/purchase/batch-confirm", data);
 };

ghsApp/src/config.js

@@ -1,4 +1,4 @@
 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'

ghsApp/src/manifest.json

@@ -62,7 +62,7 @@
                     "entitlements" : {
                         "com.apple.developer.associated-domains" : [ "applinks:fronttg.wixhb.com" ]
                     }
-                }
+                }          
             },
             /* SDK配置 */
             "sdkConfigs" : {
@@ -172,19 +172,20 @@
     "quickapp" : {},
     /* 小程序特有相关 线上（销花宝） wxcf32b3f0684c2433 开发（花掌柜） wx21b7c3ef12082099 */
     "mp-weixin" : {
-        "appid" : "wxcf32b3f0684c2433",
+        "appid" : "wx21b7c3ef12082099",
         "setting" : {
             "urlCheck" : false
         },
-        "optimization" : {
-            "subPackages" : true
-        },
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
                 "desc" : "请点击确定"
             }
-        }
+        },
+        "optimization" : {
+            "subPackages" : true
+        },
+        "lazyCodeLoading":"requiredComponents"
     },
     "mp-alipay" : {
         "usingComponents" : true
@@ -213,7 +214,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

@@ -40,7 +40,7 @@
 					<view>确认时间：</view>
 					<view>
 
-						<picker mode="date" :value="payDate" @change="updateConfirmTime" style="width:400upx;">
+						<picker mode="date" :value="payDate" @change="updateConfirmTime" style="width:500upx;">
 							<view class="uni-input">{{ detailInfo.payTime?detailInfo.payTime.substr(5,11):'' }}</view>
 						</picker>
 

ghsApp/src/pagesPurchase/info.vue

@@ -21,8 +21,12 @@
 				</view>
 				<view class="order-info_box">
 					<view>入库日期：</view>
-					<view v-if="detailInfo.status==4">{{ detailInfo.entryTime?detailInfo.entryTime.substr(2,14):'' }}</view>
-					<view v-else></view>
+					<view>
+						<picker mode="date" :value="entryTime" @change="updateEntryTime" style="width:500upx;">
+							<view v-if="detailInfo.status==4">{{ detailInfo.entryTime?detailInfo.entryTime.substr(2,14):'' }}</view>
+							<view v-else>待入库</view>
+						</picker>
+					</view>				
 				</view>
 				<view class="order-info_box">
 					<view>订单编码：</view>
@@ -249,7 +253,7 @@
 	</view>
 </template>
 <script>
-import { getPurchaseDetailApi,updateRemark,printAll,printItem,confirmPutIn,cancelPutIn,printBill } from "@/api/purchase";
+import { getPurchaseDetailApi,updateRemark,printAll,printItem,confirmPutIn,cancelPutIn,printBill,modifyEntryTime } from "@/api/purchase";
 import productMins from "@/mixins/product";
 import TuiListCell from "@/components/plugin/list-cell";
 import ModalModule from "@/components/plugin/modal"
@@ -276,7 +280,8 @@ export default {
 			printType:0,
 			printLabelShow:false,
 			printNum:'',
-			wcPrintNum:1
+			wcPrintNum:1,
+			entryTime:''
 		};
 	},
 	onPullDownRefresh() {
@@ -285,6 +290,18 @@ export default {
 		})
 	},
 	methods: {
+		updateEntryTime(e){
+			let that = this
+			this.entryTime = e.detail.value
+			that.$util.confirmModal({content:'确认修改？'},() => {
+				modifyEntryTime({id:that.detailInfo.id,date:that.entryTime}).then(res=>{
+					if(res.code == 1){
+						that.$msg(res.msg)
+						that.init()
+					}
+				})
+			})
+		},
 		printBillFn(info){
 			if(this.wcPrintNum > 1){
 				let arr = ['请选择','机器1']

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

@@ -44,7 +44,7 @@
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册，以便支持您修改头像、门店图片或花材图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限，以便支持您直接拍照上传头像、门店图片或花材图片"
                 },
-				"idfa" : false
+                "idfa" : false            
             },
             /* SDK配置 */
             "sdkConfigs" : {
@@ -132,13 +132,10 @@
     "quickapp" : {},
     /* 小程序特有相关 线上（销花宝） wxcf32b3f0684c2433 开发（花掌柜） wx21b7c3ef12082099 */
     "mp-weixin" : {
-        "appid" : "wxcf32b3f0684c2433",
+        "appid" : "wx21b7c3ef12082099",
         "setting" : {
             "urlCheck" : false
         },
-        "optimization" : {
-            "subPackages" : true
-        },
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
@@ -173,7 +170,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 = 'http://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,5 +1,5 @@
 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 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'

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

@@ -152,7 +152,7 @@
     "quickapp" : {},
     /* 小程序特有相关 线上（花掌柜） wx0d42f5f1dcb3a370 开发（花美玲） wxe4675bab299a52f7 */
     "mp-weixin" : {
-        "appid" : "wx0d42f5f1dcb3a370",
+        "appid" : "wxe4675bab299a52f7",
         "setting" : {
             "urlCheck" : false
         },
@@ -164,7 +164,8 @@
         },
         "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.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 {

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

@@ -144,7 +144,7 @@
     "quickapp" : {},
     /* 小程序特有相关 线上（花掌柜） wx0d42f5f1dcb3a370 开发（花美玲） wxe4675bab299a52f7 */
     "mp-weixin" : {
-        "appid" : "wx0d42f5f1dcb3a370",
+        "appid" : "wxe4675bab299a52f7",
         "setting" : {
             "urlCheck" : false
         },

hdPad/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 {

jd/vue.config.js

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

jdApp/src/config.js

@@ -1,4 +1,4 @@
 export const ProjectName = 'ghs'
-export const APIHOST = 'https://api.shop.zhhinc.com'
-export const IMGHOST = 'https://img.zhhinc.com'
-export const CURRENT_ENV = 'production'
+export const APIHOST = 'https://api.shop.huadianbao.net'
+export const IMGHOST = 'https://img.huadianbao.net'
+export const CURRENT_ENV = 'dev'

jdApp/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wx685d3b6a0063ff2e",
+  "extAppid": "wxcb52034801895551",
   "directCommit": false,
   "ext": {
-    "account": 12358,
-    "apiHost": "https://api.shop.zhhinc.com",
-    "socketApiHost": "api.shop.zhhinc.com",
-    "imgHost": "https://img.zhhinc.com",
+    "account": 12362,
+    "apiHost": "https://api.shop.huadianbao.net",
+    "socketApiHost": "api.shop.huadianbao.net",
+    "imgHost": "https://img.huadianbao.net",
     "name":"花来旺"
   }
 }

jdApp/src/manifest.json

@@ -61,7 +61,7 @@
                     "entitlements" : {
                         "com.apple.developer.associated-domains" : [ "applinks:fronttg.zhhinc.com" ]
                     }
-                }
+                }          
             },
             /* SDK配置 */
             "sdkConfigs" : {
@@ -73,8 +73,8 @@
                 },
                 "share" : {
                     "weixin" : {
-                        "appid" : "wx685d3b6a0063ff2e",
-                        "UniversalLinks" : ""
+                        "appid" : "wxb379c1f2f3ef705e",
+                        "UniversalLinks" : "https://fronttg.wixhb.com/uni-universallinks/__UNI__BD781B0/"
                     }
                 },
                 "ad" : {},
@@ -160,19 +160,20 @@
     "quickapp" : {},
     /* 小程序特有相关*/
     "mp-weixin" : {
-        "appid" : "wx685d3b6a0063ff2e",
+        "appid" : "wxcb52034801895551",
         "setting" : {
             "urlCheck" : false
         },
-        "optimization" : {
-            "subPackages" : true
-        },
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
                 "desc" : "请点击确定"
             }
-        }
+        },
+        "optimization" : {
+            "subPackages" : true
+        },
+        "lazyCodeLoading":"requiredComponents"
     },
     "mp-alipay" : {
         "usingComponents" : true
@@ -201,7 +202,7 @@
             "port" : 81,
             "proxy" : {
                 "/api" : {
-                    "target" : "http://api.shop.zhhinc.com",
+                    "target" : "http://api.shop.huadianbao.net",
                     "secure" : false,
                     "changeOrigin" : true,
                     "pathRewrite" : {

jdApp/src/static/iconfont/iconfont.css

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

mallApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "商城",
     "appid" : "",
     "description" : "应用描述",
-    "versionName" : "1.0.10",
-    "versionCode" : "1010",
+    "versionName" : "1.0.11",
+    "versionCode" : "1011",
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -38,8 +38,8 @@
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册，以便支持您修改头像、门店图片或花材图片",
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册，以便支持您修改头像、门店图片或花材图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限，以便支持您直接拍照上传头像、门店图片或花材图片"
-				},
-				"idfa" : false
+                },
+                "idfa" : false            
             },
             /* SDK配置 */
             "sdkConfigs" : {
@@ -54,13 +54,17 @@
     "quickapp" : {},
     /* 小程序特有相关 线上（花卉宝） wx99a1dfc4171efb42 开发（中花卉） wxe41bd5816affd0ba */
     "mp-weixin" : {
-        "appid" : "wx99a1dfc4171efb42",
+        "appid" : "wxe41bd5816affd0ba",
         "setting" : {
             "urlCheck" : false
         },
+        "optimization" : {
+            "subPackages" : true
+        },
         "usingComponents" : true,
         "permission" : {
-        }
+        },
+        "lazyCodeLoading":"requiredComponents"
     },
     "mp-alipay" : {
         "usingComponents" : true

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 = 'http://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: {