高敬炎 преди 2 години
родител
ревизия
9a5690139f
променени са 2 файла, в които са добавени 28 реда и са изтрити 9 реда
  1. 27 8
      xiaochengxu/pages/cardHolder/cardHolder.vue
  2. 1 1
      xiaochengxu/pages/circle/detail.vue

+ 27 - 8
xiaochengxu/pages/cardHolder/cardHolder.vue

@@ -337,6 +337,7 @@
 				unread: 0,
 				clicknum: 0,
 				noticeList: [],
+				status:0,
 			};
 		},
 		onShow() {
@@ -350,21 +351,32 @@
 				});
 				this.searchVal = uni.getStorageSync("search_val") ? uni.getStorageSync("search_val") : ''
 			} else {
-				this.login()
+				if(uni.getLaunchOptionsSync().scene!=1154){
+					this.login()
+				}
 			}
 
 		},
 		mounted() {
 
 		},
-		onLoad: function() {
-			wx.showShareMenu({
-				withShareTicket: true,
-				menus: ["shareAppMessage", "shareTimeline"]
-			})
+		onLoad: function(options) {
+			this.status=uni.getLaunchOptionsSync().scene
+			if(uni.getLaunchOptionsSync().scene==1154){
+				uni.showToast({
+					title: '请前往小程序查看名片',
+					icon:'none',
+					duration:10000
+				});	
+			}else{
+				wx.showShareMenu({
+					withShareTicket: true,
+					menus: ["shareAppMessage", "shareTimeline"]
+				})
+			}
+			
 		},
 		onShareAppMessage(res) {
-
 			console.log(res, this.popupshow)
 			let that = this;
 			//生成名片图片
@@ -927,6 +939,13 @@
 				this.isShowType = false
 			},
 			async upCallback(page) {
+				if(uni.getLaunchOptionsSync().scene==1154){
+					uni.showToast({
+						title: '请前往小程序查看名片',
+						icon:'none',
+						duration:10000
+					});	
+				}else{
 				var that = this
 				uni.showLoading({
 					title: '数据加载中'
@@ -996,9 +1015,9 @@
 					}
 					console.log(this.unread)
 				})
+				}
 			},
 			login() {
-				debugger
 				let that = this
 				uni.login({
 					"provider": "weixin",

+ 1 - 1
xiaochengxu/pages/circle/detail.vue

@@ -75,7 +75,7 @@
 				</view>
 			</view>
 		</mescroll-body>
-		<u-picker :show="isShowCard" :columns="cardList" keyName="cardBusiness" @confirm="cardConfirm"></u-picker>
+		<u-picker  @cancel="isShowCard=false" :show="isShowCard" :columns="cardList" keyName="cardBusiness" @confirm="cardConfirm"></u-picker>
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="show" :content='content' @confirm="$u.debounce(joinCircle, 500)" showCancelButton
 			@cancel="show=false" @close="show=false" closeOnClickOverlay></u-modal>