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

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

pages/index/center.vue

@@ -39,7 +39,7 @@
 					<view class="activate-tips" style="padding-left: 27rpx;">
 						<view>代理商权益</view>
 						<view>
-							将于<text class="activate-highlight">{{userInfo.endTime || '-'}}</text>到期
+							将于<text class="activate-highlight">{{ userInfo.endTime ? $dayjs(userInfo.endTime).format('YYYY年M月D日') : '-'}}</text>到期
 						</view>
 					</view>
 					<view class="btn-activate" @click="onActivate">

pages_order/mine/team.vue

@@ -84,7 +84,7 @@
           </view>
           <view class="flex flex-column right">
             <view>{{ $dayjs(item.createTime).format('HH:mm:ss') }}</view>
-            <view>{{ $dayjs(item.createDate).format('YYYY-MM-DD') }}</view>
+            <view>{{ $dayjs(item.createTime).format('YYYY-MM-DD') }}</view>
           </view>
         </view>
       </view>

pages_order/record/articleSharing.vue

@@ -150,7 +150,7 @@
     computed: {
 			...mapState(['userInfo']),
       userId() {
-        return this.form.userId || this.userInfo?.intentionCode
+        return this.userInfo?.intentionCode
       },
     },
 		onLoad(option) {
@@ -178,12 +178,13 @@
         imageUrl: headImage,
         path: `/pages_order/sharing/article?id=${this.id}&state=3&shareId=${this.userInfo.id}`
       }
-//调用增加分享次数的方法
-	  const params = {
-	    id:this.id,
-	    state:"3",
-	  }
-	  this.$fetch('addLogShareInfo', params)
+      
+      //调用增加分享次数的方法
+      const params = {
+        id:this.id,
+        state:"3",
+      }
+      this.$fetch('addLogShareInfo', params)
       // todo: get times and check is unlocked
 
       this.isLocked = false
@@ -333,7 +334,6 @@
           } = this.form
 
           const params = {
-            id: this.id,
             userId: this.userId,
             headImage,
             headTitle,

pages_order/record/groupSharing.vue

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

pages_order/record/personalSharing.vue

@@ -195,12 +195,8 @@
     computed: {
 			...mapState(['userInfo']),
       userId() {
-        return this.form.userId || this.userInfo?.intentionCode
+        return this.userInfo?.intentionCode
       },
-      disabled() {
-        // todo
-        return ![0, 1].includes(this.status) 
-      }
     },
 		onLoad(option) {
       const { id } = option

pages_order/sharing/article.vue

@@ -96,14 +96,14 @@
         query: `id=${this.id}&state=3&shareId=${this.userInfo.id}`,
       }
 
- //调用增加分享次数的方法
-	  	  const params = {
-	  	    id:this.id,
-	  	    state:"3",
-	  	  }
-	  	  this.$fetch('addLogShareInfo', params)
+      //调用增加分享次数的方法
+      const params = {
+        id:this.id,
+        state:"3",
+      }
+      this.$fetch('addLogShareInfo', params)
+
       this.refreshLockStatus()
-      this.closePopup()
 
       return o
     },

pages_order/sharing/video.vue

@@ -103,12 +103,12 @@
         query: `id=${this.id}&state=1&shareId=${this.userInfo.id}`,
       }
 	  
-//调用增加分享次数的方法
-	  const params = {
-	    id:this.id,
-	    state:"1",
-	  }
-	  this.$fetch('addLogShareInfo', params)
+      //调用增加分享次数的方法
+      const params = {
+        id:this.id,
+        state:"1",
+      }
+      this.$fetch('addLogShareInfo', params)
 
       this.refreshLockStatus()