Merge branch 'master' of git.huaml.com:zhh/front-end

ghsApp/src/admin/book/detail.vue

@@ -58,7 +58,7 @@ export default {
 		return {
 			title: this.pageTitle,
 			desc: "",
-			imgUrl: "",
+			imageUrl: "",
 			path: "admin/book/detail?id="+this.option.id,
 		}
 	},

ghsApp/src/admin/book/index.vue

@@ -30,7 +30,7 @@ export default {
 		return {
 			title: '销花宝使用教程',
 			desc: "图文视频教学，带您快速上手",
-			imgUrl: `${this.$constant.imgUrl}/logo.png`,
+			imageUrl: `${this.$constant.imgUrl}/logo.png`,
 			path: "admin/book/index",
 		}
 	},

ghsApp/src/admin/clear/customInfo.vue

@@ -118,6 +118,7 @@ import { getCustomDetail,cancel,confirmClear } from "@/api/clear/index";
 import productMins from "@/mixins/product";
 import TuiListCell from "@/components/plugin/list-cell";
 import { IMGHOST } from '@/config'
+import { mapGetters } from "vuex";
 export default {
 	name: "customInfo",
 	components: {
@@ -134,16 +135,21 @@ export default {
 			loading: false
 		};
 	},
+	computed: {
+		...mapGetters({ dictInfo:"getDictionariesInfo" })
+	},
   	onShareAppMessage(res) {
+		
 		return {
 			title: '点击查账和结账',
 			desc: "",
-			imgUrl: IMGHOST+'/custom/hit_me_clear.jpg',
+			imageUrl: IMGHOST+'/custom/hit_me_clear.jpg',
 			path: "admin/clear/showBill?id="+this.detailInfo.id,
 		}
 	},
 	methods: {
 		inviteClear(){
+            let miniOriginalId = that.dictInfo.miniOriginalId && that.dictInfo.miniOriginalId.current && that.dictInfo.miniOriginalId.current.ghs ? that.dictInfo.miniOriginalId.current.ghs : ''
 			uni.share({
 				provider: "weixin", //分享服务提供商（即weixin|qq|sinaweibo）
 				scene: 'WXSceneSession', //场景，可取值参考下面说明。
@@ -152,7 +158,7 @@ export default {
 				summary: '暂无', //分享内容的摘要
 				imageUrl: IMGHOST+'/custom/hit_me_clear.jpg',//图片一定要有，不然会分享失败
 				miniProgram: {
-					id: 'gh_2e886744af66',//小程序原始id，发起分享的 App 与小程序属于同一微信开放平台帐号
+					id: miniOriginalId,//小程序原始id，发起分享的 App 与小程序属于同一微信开放平台帐号
 					path: "admin/clear/showBill?id="+this.detailInfo.id,
 					type: 0,// 0-正式版； 1-测试版； 2-体验版
 					webUrl: 'https://www.wixhb.com'
@@ -214,6 +220,7 @@ export default {
 			});
 		},
 		async init() {
+			console.log(IMGHOST+'/custom/hit_me_clear.jpg')
 			const { id } = this.option;
 			if (!id) {
 				return;

ghsApp/src/admin/home/components/OrderItem.vue

@@ -45,7 +45,7 @@
         <div class="list-bottom">
             <div class="list-button">
                 <view v-if="item.status == 1 || item.status == 5"><button disabled="true" class="admin-button-com bule active">打印(${item.printNum})</button> </view>
-                <view><button @click.stop="printOrder(item)" class="admin-button-com bule">打印<text v-if="Number(item.printNum)>0">({{item.printNum}})</text></button> </view>
+                <view v-else><button @click.stop="printOrder(item)" class="admin-button-com bule">打印<text v-if="Number(item.printNum)>0">({{item.printNum}})</text></button> </view>
             </div>
         </div>
     </view>

ghsApp/src/admin/home/login.vue

@@ -187,7 +187,7 @@ export default {
 				return false				
 			}
 
-			//uni.showLoading({mask:true})
+			uni.showLoading({mask:true})
 			uni.preLogin({
 				provider: 'univerify',
 				success:()=>{
@@ -207,7 +207,7 @@ export default {
 							let access_token = res.authResult.access_token
 							phoneLogin({openid,access_token}).then(subRes=>{
 								let token = subRes.data.token || ''
-								//uni.hideLoading()
+								uni.hideLoading()
 								if (that.$util.isEmpty(token)) {
 									that.$msg('请先注册')
 									return false
@@ -243,13 +243,13 @@ export default {
 							})
 						},
 						fail(res){
-							uni.showToast({title:'登录失败', duration: 3000, icon:'none'})
+							uni.showToast({title:'登录失败了哦', duration: 3000, icon:'none'})
 							//关闭一键登录弹出窗口
 							uni.closeAuthView()
 							console.log(res)
 						},
 						complete: (res) => {
-							//uni.hideLoading()
+							uni.hideLoading()
 							uni.closeAuthView()
 						}
 					})
@@ -263,7 +263,7 @@ export default {
 					} else if(res.code == 40004) {
 						uni.showToast({title: '即将开通...', duration: 3000, icon:'none'})
 					} else {
-						uni.showToast({title: '登录失败', duration: 3000, icon:'none'})
+						uni.showToast({title: '登录失败...', duration: 3000, icon:'none'})
 					}
 					console.log(res)
 				}

ghsApp/src/admin/home/mall.vue

@@ -19,7 +19,6 @@
 import { mainGetMallPoster } from '@/api/main/index'
 import { getWeixinId } from "@/api/invite/index";
 import { mapGetters } from "vuex";
-import { CURRENT_ENV } from '@/config'
 export default {
   data() {
     return {

ghsApp/src/manifest.json

@@ -78,7 +78,7 @@
                 "share" : {
                     "weixin" : {
                         "appid" : "wxb379c1f2f3ef705e",
-                        "UniversalLinks" : "https://fronttg.wixhb.com/ulink/"
+                        "UniversalLinks" : "https://fronttg.wixhb.com/uni-universallinks/__UNI__BD781B0/"
                     }
                 },
                 "ad" : {},

ghsApp/src/pagesArrears/clearResult.vue

@@ -21,18 +21,23 @@
 <script>
 import { confirmClear } from "@/api/clear/index";
 import { IMGHOST } from '@/config'
+import { mapGetters } from "vuex"
 export default {
     name: "success",
 	onShareAppMessage(res) {
 		return {
 			title: '点击查账和结账',
 			desc: "",
-			imgUrl: IMGHOST+'/custom/hit_me_clear.jpg',
+			imageUrl: IMGHOST+'/custom/hit_me_clear.jpg',
 			path: "admin/clear/showBill?id="+this.option.id,
 		}
 	},
+	computed: {
+		...mapGetters({ dictInfo:"getDictionariesInfo" })
+	},
 	methods: {
 		inviteClear(){
+			let miniOriginalId = that.dictInfo.miniOriginalId && that.dictInfo.miniOriginalId.current && that.dictInfo.miniOriginalId.current.ghs ? that.dictInfo.miniOriginalId.current.ghs : ''
 			uni.share({
 				provider: "weixin", //分享服务提供商（即weixin|qq|sinaweibo）
 				scene: 'WXSceneSession', //场景，可取值参考下面说明。
@@ -41,7 +46,7 @@ export default {
 				summary: '暂无', //分享内容的摘要
 				imageUrl: IMGHOST+'/custom/hit_me_clear.jpg',//图片一定要有，不然会分享失败
 				miniProgram: {
-					id: 'gh_2e886744af66',//小程序原始id，发起分享的 App 与小程序属于同一微信开放平台帐号
+					id: miniOriginalId,//小程序原始id，发起分享的 App 与小程序属于同一微信开放平台帐号
 					path: "admin/clear/showBill?id="+this.option.id,
 					type: 0,// 0-正式版； 1-测试版； 2-体验版
 					webUrl: 'https://www.wixhb.com'

ghsApp/src/pagesClient/official/index.vue

@@ -135,7 +135,7 @@ export default {
     return {
       title: "更懂您的销花宝",
       desc: "",
-      imgUrl: "",
+      imageUrl: "",
       path: "pagesClient/official/index?ghsShopAdminId="+this.getLoginInfo.shopAdminId+"&hdShopAdminId="+this.option.hdShopAdminId,
     }
 	},
@@ -190,7 +190,7 @@ export default {
     return {
       title: "更懂您的销花宝",
       desc: "",
-      imgUrl: "",
+      imageUrl: "",
       path: "pagesClient/official/index?ghsShopAdminId="+ghsShopAdminId+"&hdShopAdminId="+hdShopAdminId,
     }
 

ghsApp/src/pagesOrder/detail.vue

@@ -222,9 +222,7 @@
 
 		</view>
 		<div class="app-footer">
-			<button @click="cancelOrderFn(detailInfo.cgInfo.id)" v-if="showCancelBtn && showCancelOrder(detailInfo.cgInfo)" class="admin-button-com default" :class="active">
-				取消订单
-			</button>
+			<button @click="cancelOrderFn(detailInfo)" v-if="detailInfo.status == 1" class="admin-button-com default" :class="active">取消</button>
 			<template v-for="s in detailInfo.buttonList">
 				<button :key="s.type" @click="clickBtn(s, detailInfo)" v-if="s.show == 1" :disabled="s.disable === 1" class="admin-button-com default" :class="s.disable === 1?'active':''">
 					{{ s.type === "print" ? s.name+`(${detailInfo.printNum})` : s.name}}
@@ -341,15 +339,15 @@ export default {
 		modalCancel() {
 			this.freeShipModal = false;
 		},
-		cancelOrderFn(cgId) {
+		cancelOrderFn(info) {
 			let that = this
-			that.$util.confirmModal({content:'确认取消此采购单？'},() => {
-				var params = {id:cgId}
+			that.$util.confirmModal({content:'确认取消？'},() => {
+				var params = {orderId:info.id}
 				cancelOrder(params).then((res) => {
 					if(res.code == 1){
 						this.showCancelBtn = false
 						this.detailInfo.status = 5
-						this.$msg("采购单取消成功")
+						this.$msg("取消成功")
 					}
 				}).catch((error) => {
 					console.error(error);

hdApp/src/admin/home/login.vue

@@ -246,7 +246,7 @@ export default {
 							})
 						},
 						fail(res){
-							uni.showToast({title:'登录失败', duration: 3000, icon:'none'})
+							uni.showToast({title:'登录失败了哦', duration: 3000, icon:'none'})
 							//关闭一键登录弹出窗口
 							uni.closeAuthView()
 							console.log(res)
@@ -266,7 +266,7 @@ export default {
 					} else if(res.code == 40004) {
 						uni.showToast({title: '即将开通...', duration: 3000, icon:'none'})
 					} else {
-						uni.showToast({title: '登录失败', duration: 3000, icon:'none'})
+						uni.showToast({title: '登录失败...', duration: 3000, icon:'none'})
 					}
 					console.log(res)
 				}

hdApp/src/admin/home/workbench.vue

@@ -123,7 +123,7 @@ export default {
       return {
         title: "",
         desc: "",
-        imgUrl: "",
+        imageUrl: "",
         path: ""
       };
   },

hdApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
-    "versionName" : "1.1.1",
-    "versionCode" : 111,
+    "versionName" : "1.1.2",
+    "versionCode" : 112,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

hdApp/src/pagesClient/member/detail.vue

@@ -145,7 +145,7 @@ export default {
 			return  {
           title: "更懂您的花掌柜",
           desc: "",
-          imgUrl: this.constant.imgUrl + "/retail/official/banner-1.png",
+          imageUrl: this.constant.imgUrl + "/retail/official/banner-1.png",
           path: "pagesClient/official/index?introMerchantId=" + this.userInfo.id
         }
 		} else if (res.target.id === "1") {

hdApp/src/pagesClient/official/index.vue

@@ -125,7 +125,7 @@ export default {
     return {
       title: "更懂您的花掌柜",
       desc: "",
-      imgUrl: "",
+      imageUrl: "",
       path: "pagesClient/official/index?ghsShopAdminId="+ghsShopAdminId+"&hdShopAdminId="+hdShopAdminId,
     }
 

hdApp/src/pagesPurchase/particulars.vue

@@ -5,15 +5,17 @@
       <view class="result-view">
         <view :class="['iconfont', 'iconchenggong']"></view>
         <view class="result-title">支付成功</view>
+
+        <button class="admin-button-com big" @click="goDetail">订单详情</button>
+        <button v-if="ghsCgScene!=''" class="admin-button-com big" @click="goHome">返回首页</button>
+        <button v-else class="admin-button-com big" @click="goBack">返回</button>
+
         <view v-if="ghsCgScene!='' || fromCg == 1">
         <view style="font-size:28upx;">如需再次下单，微信下拉找到【花掌柜】小程序，如图点采购进去，即可再次下单</view>
         <view style="margin-bottom:30upx;margin-top:15upx;">
           <image class="image" :src="`${constant.imgUrl}/cg/hd_cg_route.png`" mode="widthFix"></image>
         </view>
         </view>
-        <button class="admin-button-com blue big" @click="goDetail">订单详情</button>
-        <button v-if="ghsCgScene!=''" class="admin-button-com big" @click="goHome">返回首页</button>
-        <button v-else class="admin-button-com big" @click="goBack">返回</button>
       </view>
     </view>
   </view>

hdPad/src/pages/home/components/workInfo.vue

@@ -165,6 +165,7 @@ export default {
   methods:{
 		calcFn(){
 			this.calc = this.calc == 'add' ? 'sub' : 'add'
+      		this.$emit('calcFn',this.calc)
 		},
     printFn(item){
       if(item.status ==1){

hdPad/src/pages/home/work.vue

@@ -9,7 +9,7 @@
                 <workList @getOrder="getOrder"></workList>
             </view>
             <view class="work-info">
-                <workInfo ref="workInfoRef" :selectOrderId="selectOrderId"></workInfo>
+                <workInfo ref="workInfoRef" :selectOrderId="selectOrderId" @calcFn="calcFn"></workInfo>
             </view>
         </view>
     </view>
@@ -41,7 +41,6 @@ export default {
 			this.$refs.workInfoRef.getOrderDetail(this.selectOrderId)
 		}
 		// #ifdef APP-PLUS
-		console.log('11111')
 		this.listenScanItem()
 		// #endif
 	},
@@ -58,6 +57,9 @@ export default {
 		// #endif
 	},
 	methods: {
+		calcFn(val){
+			this.calc = val
+		},
 		getOrder(item){
 			this.selectOrderId = Number(item.id)
 			this.currentJobId = Number(item.id)

开发/ghsApp/src/manifest.json

@@ -59,7 +59,12 @@
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册，以便支持您修改头像、门店图片或花材图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限，以便支持您直接拍照上传头像、门店图片或花材图片"
                 },
-                "idfa" : false            
+                "idfa" : false,
+                "capabilities" : {
+                    "entitlements" : {
+                        "com.apple.developer.associated-domains" : [ "applinks:fronttg.wixhb.com" ]
+                    }
+                }          
             },
             /* SDK配置 */
             "sdkConfigs" : {

开发/hdApp/src/manifest.json

@@ -88,7 +88,12 @@
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册，以便支持您修改头像、门店图片或花材图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限，以便支持您直接拍照上传头像、门店图片或花材图片"
                 },
-                "idfa" : false            
+                "idfa" : false,
+                "capabilities" : {
+                    "entitlements" : {
+                        "com.apple.developer.associated-domains" : [ "applinks:fronttg.huahb.cn" ]
+                    }
+                }           
             },
             /* SDK配置 */
             "sdkConfigs" : {

线上/ghsApp/src/manifest.json

@@ -59,7 +59,13 @@
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册，以便支持您修改头像、门店图片或花材图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限，以便支持您直接拍照上传头像、门店图片或花材图片"
                 },
-                "idfa" : false            },
+                "idfa" : false,
+                "capabilities" : {
+                    "entitlements" : {
+                        "com.apple.developer.associated-domains" : [ "applinks:fronttg.wixhb.com" ]
+                    }
+                }
+            },
             /* SDK配置 */
             "sdkConfigs" : {
                 "speech" : {

线上/hdApp/src/manifest.json

@@ -88,7 +88,12 @@
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册，以便支持您修改头像、门店图片或花材图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限，以便支持您直接拍照上传头像、门店图片或花材图片"
                 },
-                "idfa" : false
+                "idfa" : false,
+                "capabilities" : {
+                    "entitlements" : {
+                        "com.apple.developer.associated-domains" : [ "applinks:fronttg.huahb.cn" ]
+                    }
+                }
             },
             /* SDK配置 */
             "sdkConfigs" : {