Merge branch 'master' of http://175.178.51.79:3000/hly/fission-star-applet-250304 into fox

api/model/sharing.js

@@ -8,6 +8,16 @@ const api = {
 		auth: true,
 		debounce: 500,
 	},
+	/**
+	 * 点击增肌个人分享记录
+	 */
+	addLogShareInfo: {
+		url: '/fen/addLog',
+		method: 'POST',
+		auth: true, 
+		limit : 500,
+		showLoading : true,
+	},
   /**
    * 删除分享记录
    */

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "unapp模板",
-    "appid" : "__UNI__197A38F",
+    "appid" : "__UNI__A010721",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -57,8 +57,8 @@
             "urlCheck" : false,
             "minified" : true
         },
-        "optimization": {
-            "subPackages": true 
+        "optimization" : {
+            "subPackages" : true
         },
         "usingComponents" : true,
         "permission" : {

pages/index/center.vue

@@ -14,12 +14,15 @@
 				<view class="tags">
 					<view class="tag">
 						<text class="tag-label">ID:</text>
-						<text>{{ userInfo.id }}</text>
+						<text>{{ userInfo.intentionCode }}</text>
 					</view>
 					<view v-if="role" style="display: inline-block; width: 172rpx; height: 63rpx; vertical-align: top; margin-top: -6rpx;">
 						<image src="@/pages_order/static/center/agent-icon.png"></image>
 					</view>
-					<view v-else class="tag">
+					<!-- <view v-else class="tag" >
+						代理商:{{userInfo.endTime}} 到期
+					</view> -->
+					<view v-else class="tag" v-else>
 						普通会员
 					</view>
 				</view>
@@ -36,7 +39,7 @@
 					<view class="activate-tips" style="padding-left: 27rpx;">
 						<view>代理商权益</view>
 						<view>
-							将于<text class="activate-highlight">{{ $dayjs(userInfoVip.vip_time).format('YYYY年M月D日') () }}</text>到期
+							将于<text class="activate-highlight">{{userInfo.endTime}}</text>到期
 						</view>
 					</view>
 					<view class="btn-activate" @click="onActivate">
@@ -157,7 +160,7 @@
 		computed: {
 			...mapState(['userInfo', 'userInfoVip']),
 			role() {
-				return this.userInfo.role
+				return this.userInfo.isPay
 			}
 		},
 		onShow() {

pages_order/mine/wallet.vue

@@ -49,7 +49,7 @@
             <view class="flex detail-list-item-row highlight">
               <text>{{ item.title }}</text>
               <!-- status: 0-收 1-支 -->
-              <template v-if="item.status === '0'">
+              <template v-if="item.type === 0">
                 <text class="count count-in">{{ `+${item.price}` }}</text>
               </template>
               <template v-else>

pages_order/record/groupSharing.vue

@@ -237,7 +237,12 @@
         imageUrl: indexImage,
         path: `/pages_order/sharing/group?id=${this.id}&state=2&shareId=${this.userInfo.id}`
       }
-
+//调用增加分享次数的方法
+	  const params = {
+	    id:this.id,
+	    state:"3",
+	  }
+	  this.$fetch('addLogShareInfo', params)
       // todo: get times and check is unlocked
 
       this.isLocked = false

pages_order/record/personalSharing.vue

@@ -220,6 +220,7 @@
       const {
         textDetails,
         indexImage,
+		textDetails,
       } = this.form
 
       let o = {
@@ -227,6 +228,16 @@
         imageUrl: indexImage,
         path: `/pages_order/sharing/personal?id=${this.id}&state=0&shareId=${this.userInfo.id}`
       }
+	  
+	  //调用增加分享次数的方法
+	  const params = {
+	    id:this.id,
+	    state:"0",
+	  }
+	  this.$fetch('addLogShareInfo', params)
+	  
+	  
+	  
 
       this.isLocked = false
 

pages_order/record/videoSharing.vue

@@ -228,6 +228,12 @@
         path: `/pages_order/sharing/video?id=${this.id}&state=1&shareId=${this.userInfo.id}`
       }
 
+ //调用增加分享次数的方法
+	  const params = {
+	    id:this.id,
+	    state:"0",
+	  }
+	  this.$fetch('addLogShareInfo', params)
       // todo: get times and check is unlocked
 
       this.isLocked = false