Merge pull request 'fox' (#6) from fox into master

Reviewed-on: http://175.178.51.79:3000/hly/fission-star-applet-250304/pulls/6

components/center/popupActivate.vue

@@ -77,6 +77,8 @@
         try {
 
           await this.$fetch('openVip', { code: this.code })
+          
+          this.$store.commit('getUserInfo')
 
           uni.showToast({
             title: '激活成功',

pages/index/center.vue

@@ -4,11 +4,11 @@
 		<navbar title="个人中心" bgColor="#001B3C" color="#FFFFFF" />
 
 		<view class="head">
-			<view class="headImage">
+			<view class="headImage"  @click="goToEditUserInfo">
 				<image :src="userInfo.headImage" mode=""></image>
 			</view>
 			<view class="info">
-				<view class="name">
+				<view class="name"  @click="goToEditUserInfo">
 					{{ userInfo.nickName }}
 				</view>
 				<view class="tags">
@@ -192,6 +192,11 @@
 					url: `/pages_order/mine/news?id=${id}`
 				})
 			},
+			goToEditUserInfo() {
+				uni.navigateTo({
+					url: '/pages_order/auth/wxUserInfo?mode=edit'
+				})
+			},
 		}
 	}
 </script>

pages/index/index.vue

@@ -21,6 +21,8 @@
 
 		<popupAuditMsg ref="popupAuditMsgRef"></popupAuditMsg>
 		
+		<popupActivate ref="popupActivate"></popupActivate>
+
 		<tabber select="home"/>
 
 	</view>
@@ -30,11 +32,13 @@
 	import { mapState } from 'vuex'
 	import tabber from '@/components/base/tabbar.vue'
 	import popupAuditMsg from '@/components/home/popupAuditMsg.vue'
+	import popupActivate from '@/components/center/popupActivate.vue'
 
 	export default {
 		components : {
 			tabber,
 			popupAuditMsg,
+			popupActivate,
 		},
 		data() {
 			return {
@@ -98,6 +102,10 @@
 
 					return
 				}
+				if (!this.userInfo.isPay) {
+					this.$refs.popupActivate.open()
+					return
+				}
 				this.$utils.navigateTo(url)
 			}
 		},

pages/index/record.vue

@@ -67,6 +67,8 @@
 
 			<!-- todo: empty -->
 		</view>
+	
+		<popupActivate ref="popupActivate"></popupActivate>
 		
 		<tabber select="record"/>
 	</view>
@@ -78,6 +80,7 @@
 
 	import tabber from '@/components/base/tabbar.vue'
   import suspendDropdown from '@/components/base/suspendDropdown.vue'
+	import popupActivate from '@/components/center/popupActivate.vue'
 
 	const URL_MAPPING = { // state -> url
 		'0': '/pages_order/record/personalSharing',
@@ -91,6 +94,7 @@
 		components : {
 			tabber,
 			suspendDropdown,
+			popupActivate,
 		},
 		computed : {
 			...mapGetters(['userShop']),
@@ -167,6 +171,10 @@
 			},
 			//跳转分享详情页面
 			toSharingDetail(id) {
+				if (!this.userInfo.isPay) {
+					this.$refs.popupActivate.open()
+					return
+				}
 				uni.navigateTo({
 					url: `${URL_MAPPING[this.queryParams.state]}?id=${id}`
 				})

pages_order/auth/wxUserInfo.vue

@@ -91,18 +91,23 @@
 					nickName: '',
 					phone : '',
 					wxCode : '',
-				}
+				},
+				mode: 'add',
 			};
 		},
 		computed: {
 			...mapState(['configList'])
 		},
 		onShow() {},
-		onLoad() {
+		onLoad(option) {
+			const { mode } = option || {}
+
 			this.userInfoForm.phone = this.userInfo.phone || ''
 			this.userInfoForm.nickName = this.userInfo.nickName || ''
 			this.userInfoForm.headImage = this.userInfo.headImage || ''
 			this.userInfoForm.wxCode = this.userInfo.wxCode || ''
+
+			this.mode = mode
 		},
 		computed: {},
 		methods: {
@@ -144,7 +149,6 @@
 						if (self.$utils.verificationAll(self.userInfoForm, {
 								headImage: '请选择头像',
 								nickName: '请填写昵称',
-								phone: '请填写手机号',
 								wxCode: '请填写微信号',
 							})) {
 							return
@@ -157,6 +161,15 @@
 							wxCode : self.userInfoForm.wxCode,
 						}, res => {
 							if (res.code == 200) {
+								if (this.mode === 'edit') {
+									uni.showToast({
+										title: '提交成功',
+										icon: 'none'
+									})
+
+									setTimeout(uni.navigateBack, 1000, -1)
+									return
+								}
 								uni.navigateBack({
 									delta: 2,
 									fail: () => {

pages_order/mine/team.vue

@@ -10,9 +10,9 @@
           <view class="referrer-info">
             <view>
               <view class="nick-name">{{ userInfoVip.pidInfo.nickName }}</view>
-              <view>{{ `ID：${userInfoVip.pidInfo.id}` }}</view>
+              <view>{{ `ID：${userInfoVip.pidInfo.intentionCode}` }}</view>
             </view>
-            <view>
+            <view v-if="userInfoVip.pidInfo.phone">
               <view class="phone-label">手机号</view>
               <view>{{ userInfoVip.pidInfo.phone }}</view>
             </view>

pages_order/record/articleSharing.vue

@@ -150,7 +150,7 @@
     computed: {
 			...mapState(['userInfo']),
       userId() {
-        return this.form.userId || this.userInfo?.id
+        return this.form.userId || this.userInfo?.intentionCode
       },
     },
 		onLoad(option) {

pages_order/record/groupSharing.vue

@@ -208,7 +208,7 @@
     computed: {
 			...mapState(['configList', 'userInfo']),
       userId() {
-        return this.form.userId || this.userInfo?.id
+        return this.form.userId || this.userInfo?.intentionCode
       },
     },
 		onLoad(option) {

pages_order/record/personalSharing.vue

@@ -195,7 +195,7 @@
     computed: {
 			...mapState(['userInfo']),
       userId() {
-        return this.form.userId || this.userInfo?.id
+        return this.form.userId || this.userInfo?.intentionCode
       },
       disabled() {
         // todo

pages_order/sharing/group.vue

@@ -79,12 +79,12 @@
     },
     onShareAppMessage(res) {
       const {
-        headTitle,
+        textDetails,
         indexImage,
       } = this.detail
 
       let o = {
-        title : headTitle,
+        title : textDetails,
         imageUrl: indexImage,
         query: `id=${this.id}&state=2&shareId=${this.userInfo.id}`,
       }

pages_order/sharing/personal.vue

@@ -79,12 +79,12 @@
     },
     onShareAppMessage(res) {
       const {
-        headTitle,
+        textDetails,
         indexImage,
       } = this.detail
 
       let o = {
-        title : headTitle,
+        title : textDetails,
         imageUrl: indexImage,
         query: `id=${this.id}&state=0&shareId=${this.userInfo.id}`,
       }

store/store.js

@@ -85,7 +85,7 @@ const store = new Vuex.Store({
 						
 						if(!state.userInfo.nickName || !state.userInfo.headImage){
 							uni.navigateTo({
-								url: '/pages_order/auth/wxUserInfo'
+								url: '/pages_order/auth/wxUserInfo?mode=add'
 							})
 						}else{
 							uni.navigateBack({