shish 2 سال پیش
والد
کامیت
edf01e133c

+ 1 - 1
ghsApp/src/admin/home/mall.vue

@@ -101,7 +101,7 @@ export default {
               //console.log(JSON.stringify(e));
           });
         } else {
-          that.$msg("即将跳转小程序,请安装微信")
+          that.$msg("请安装微信,再打开小程序")
           return false
         }
         // #endif

+ 60 - 2
ghsApp/src/admin/home/workbench.vue

@@ -401,7 +401,36 @@ export default {
 				})
 				// #endif
 				// #ifdef APP-PLUS
-				this.$msg('暂时只能在微信上操作')
+				if(plus.runtime.isApplicationExist({pname:'com.tencent.mm',action:'weixin://'})){
+					plus.share.getServices(function(s){
+						var sweixin
+							for (var i = 0; i < s.length; i++) {
+							var t = s[i];
+							if (t.id == 'weixin') {
+								sweixin = t;
+							}
+						}
+						let miniOriginalId = that.dictInfo.miniOriginalId && that.dictInfo.miniOriginalId.current && that.dictInfo.miniOriginalId.current.hd ? that.dictInfo.miniOriginalId.current.hd : ''
+						if (sweixin && sweixin.nativeClient) {
+							sweixin.launchMiniProgram({
+								id: miniOriginalId,
+								path: '/pagesPurchase/order',
+								type: 0
+							});
+						} else {
+							that.$msg("没有找到微信")
+							//that.$msg("获取微信失败:" + e.message)
+							//console.log(JSON.stringify(e));
+							}
+					}, function(e){
+						that.$msg("没有找到微信哦")
+						//that.$msg("获取微信失败:" + e.message)
+						//console.log(JSON.stringify(e));
+					});
+				} else {
+					that.$msg("请安装微信,再打开小程序")
+					return false
+				}
 				// #endif
 			}else if(item.url == 'buyRecord'){
 				// #ifdef MP-WEIXIN
@@ -416,7 +445,36 @@ export default {
 				})
 				// #endif
 				// #ifdef APP-PLUS
-				this.$msg('暂时只能在微信上操作')
+				if(plus.runtime.isApplicationExist({pname:'com.tencent.mm',action:'weixin://'})){
+					plus.share.getServices(function(s){
+						var sweixin
+							for (var i = 0; i < s.length; i++) {
+							var t = s[i];
+							if (t.id == 'weixin') {
+								sweixin = t;
+							}
+						}
+						let miniOriginalId = that.dictInfo.miniOriginalId && that.dictInfo.miniOriginalId.current && that.dictInfo.miniOriginalId.current.hd ? that.dictInfo.miniOriginalId.current.hd : ''
+						if (sweixin && sweixin.nativeClient) {
+							sweixin.launchMiniProgram({
+								id: miniOriginalId,
+								path: '/pagesPurchase/shopping',
+								type: 0
+							});
+						} else {
+							that.$msg("没有找到微信")
+							//that.$msg("获取微信失败:" + e.message)
+							//console.log(JSON.stringify(e));
+							}
+					}, function(e){
+						that.$msg("没有找到微信哦")
+						//that.$msg("获取微信失败:" + e.message)
+						//console.log(JSON.stringify(e));
+					});
+				} else {
+					that.$msg("请安装微信,再打开小程序")
+					return false
+				}
 				// #endif
 			}else{
 				this.$util.pageTo(item)

+ 1 - 1
ghsApp/src/admin/item/list.vue

@@ -473,7 +473,7 @@ export default {
 					//console.log(JSON.stringify(e));
 				});
 			}else{
-				this.$msg("即将跳转小程序,请安装微信")
+				this.$msg("请安装微信,再打开小程序")
 				return false
 			}
 			// #endif

+ 3 - 3
ghsApp/src/admin/ptItem/components/Item.vue

@@ -11,14 +11,14 @@
 			</view>
 			<view class="kc" @click="selectItem(info)">
 				<text style="font-size:28upx;">{{info.className}}</text> 
-				<text style="margin-left:20upx;color:#907a7a;font-size:28upx;font-weight:bold;">{{info.useNum}}家在用</text>
+				<text style="margin-left:20upx;color:#735d5d;font-size:28upx;font-weight:bold;">{{info.useNum}}家在用</text>
 				
 				<text v-if="info.select == 2 && info.is_delete == 1" style="position:absolute;right:7upx;color:#1f1cc0;">恢复</text>
 
 				<text v-if="info.select == 2 && info.is_delete == 0" style="position:absolute;right:7upx;color:#1f1cc0;">查看</text>
 
-				<text v-if="info.select == 2 && info.is_delete == 1" style="color:red;float:right;margin-right:110upx;">已删除</text>
-				<text v-else-if="info.select == 2" style="color:green;float:right;margin-right:110upx;">使用中</text>
+				<text v-if="info.select == 2 && info.is_delete == 1" style="color:red;float:right;margin-right:110upx;font-weight:bold;">已删除</text>
+				<text v-else-if="info.select == 2" style="color:green;float:right;margin-right:110upx;font-weight:bold;">使用中</text>
 				<text v-else style="color:green;float:right;margin-right:110upx;border:1upx solid green;padding:10upx 10upx 10upx 10upx;border-radius:5upx;">采用</text>
 			</view>
 			<view class="num-open_bx">

+ 5 - 5
ghsApp/src/admin/shop/changeShop.vue

@@ -14,11 +14,11 @@
 							<t-th>操作</t-th>
 						</t-tr>
 						<t-tr>
-							<t-td><view style="width:150upx;font-weight:bold;color:black;font-size:27upx;">合计</view></t-td>
-							<t-td><view style="font-weight:bold;color:black;font-size:27upx;">{{shopData.totalSale}}</view></t-td>
-							<t-td><view style="font-weight:bold;color:black;font-size:27upx;">{{shopData.totalBalance}}</view></t-td>
-							<t-td><view style="font-weight:bold;color:black;font-size:27upx;">{{shopData.totalShopNum}}</view></t-td>
-							<t-td><view style="font-weight:bold;color:black;font-size:27upx;"></view></t-td>
+							<t-td><view style="width:160upx;font-weight:bold;color:black;font-size:26upx;">合计</view></t-td>
+							<t-td><view style="font-weight:bold;color:black;font-size:26upx;">{{shopData.totalSale}}</view></t-td>
+							<t-td><view style="font-weight:bold;color:black;font-size:26upx;">{{shopData.totalBalance}}</view></t-td>
+							<t-td><view style="font-weight:bold;color:black;font-size:26upx;">{{shopData.totalShopNum}}</view></t-td>
+							<t-td><view style="font-weight:bold;color:black;font-size:26upx;"></view></t-td>
 						</t-tr>
 						<t-tr v-for="(item, inIndex) in shopData.list" :key="inIndex">
 							<t-td>