修改身份证添加，首页和规则弹窗，提现看广告

.hbuilderx/launch.json

@@ -18,7 +18,7 @@
             "type" : "uniCloud"
         },
         {
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
         },
         {

common/config.js

@@ -1,6 +1,6 @@
-const ROOTPATH1 = "https://dj-api.hnsiyao.cn/czg"; //
+// const ROOTPATH1 = "https://dj-api.hnsiyao.cn/czg"; //
-const ROOTPATH = "https://dj-api.hnsiyao.cn/czg"; //后台服务域名
+// const ROOTPATH = "https://dj-api.hnsiyao.cn/czg"; //后台服务域名
-const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名
+// const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名
 
 // const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; //
 // const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名
@@ -10,12 +10,12 @@ const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名
 // const ROOTPATH = "http://192.168.1.5:8100/sqx_fast/"; //后台服务域名
 // const ROOTPATH2 = "http://192.168.1.5:8100"; //后台服务域名 
 
-// const ROOTPATH1 = "http://192.168.1.41:8100/czg"; //
+const ROOTPATH1 = "http://192.168.1.41:8100/czg"; //
-// const ROOTPATH = "http://192.168.1.41:8100/czg"; //后台服务域名
+const ROOTPATH = "http://192.168.1.41:8100/czg"; //后台服务域名
 // 测试
 // const ROOTPATH1 = "https://web-api.hnsiyao.cn/czg"; //
 // const ROOTPATH = "https://web-api.hnsiyao.cn/czg"; //后台服务域名
-// const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名
+const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名
 
 
 module.exports = {

me/yaoqing/ymg-yaoqing-tixian.vue

@@ -1,29 +1,23 @@
 <template>
   <view class="tixian">
-    <view
+    <view class="top-bg">
-        class="top-bg">
       <view class="class1">可提现总额</view>
       <view class="class2">¥ {{ mayMoney }}</view>
 
-      <view
+      <view class="class3">
-          class="class3">
         <view class="class4" style="">
           <view class="color-333 u-font-32">提现金额
             <!-- <text style="font-size: 28upx;color: #ff7581;"
               v-if="shouxufei">（注：提现手续费为{{shouxufei * 100}}%）</text> -->
           </view>
         </view>
-        <view
+        <view class="u-flex flex-row justify-between align-center" style="padding: 20upx">
-		class="u-flex flex-row justify-between align-center"
-            style="padding: 20upx">
           <view class="flex align-center">
             <view class="color-333" style="font-size: 40upx;">¥</view>
             <input type="number" v-model="money" placeholder="请输入金额" @input="ymfmoneyInput" @blur="ymfymfmoneyBlur"
-			class="color-333 u-text-left u-m-l-10 u-font-40"
+              class="color-333 u-text-left u-m-l-10 u-font-40" style="width: 80%;" />
-                   style="width: 80%;"/>
           </view>
-          <view @click="ymfsetAllMoney"
+          <view @click="ymfsetAllMoney" class="u-font-28 color-333 u-p-l-15 u-p-r-15 u-p-t-16 u-p-b-16 flex-0 "
-		  class="u-font-28 color-333 u-p-l-15 u-p-r-15 u-p-t-16 u-p-b-16 flex-0 "
             style="background: #ff7581;color: white;border-radius: 10rpx;">
             全部
           </view>
@@ -44,14 +38,13 @@
           </view>
         </view> -->
       </view>
-      <view @click="ymfgetOut"
+      <view @click="withdraw" class="u-m-40 u-font-36 color-fff u-border-10"
-	  class="u-m-40 u-font-36 color-fff u-border-10"
         style="background: #ff7581;border-radius: 10px;height: 80rpx;line-height: 80rpx;">
-        提现
+        <!-- 提现 -->
+        {{ !isWithdraw ? '观看广告提现' : '立即提现' }}
       </view>
 
-      <view 
+      <view class="flex w-full justify-center ">
-	  class="flex w-full justify-center ">
         <view class="u-flex-1" style="color: grey;padding-bottom: 30px;padding-top: 20upx;" @click="ymfgoaliZhiFuBao">
           提现账号
         </view>
@@ -102,6 +95,21 @@
       </view>
 
     </view>
+    <u-modal v-model="ruleShow" confirm-text="知道了" title="规则说明" :title-style="{ fontWeight: '700' }"
+      confirm-color="rgb(255, 117, 129)">
+      <view class="u-p-30 u-text-left">
+        <scroll-view scroll-y="true" style="max-height: 50vh;">
+          <rich-text class="color-666" :nodes="ruleInfo"></rich-text>
+        </scroll-view>
+      </view>
+
+    </u-modal>
+    <!-- 激励视频广告 -->
+    <ad-rewarded-video v-if="adRewardedVideo" ref="adRewardedVideo" adpid="1531580352" :loadnext="true"
+      v-slot:default="{ loading, error }" :url-callback="urlCallback" @load="onadload" @close="onadclose"
+      @error="onaderror">
+      <view class="ad-error" v-if="error">{{ error }}</view>
+    </ad-rewarded-video>
   </view>
 </template>
 
@@ -141,6 +149,27 @@ export default {
       page: 1,
       limit: 10,
       totalCount: 0,
+      isWithdraw: false,
+      urlCallback: null,
+      adRewardedVideo: true,
+      ruleShow: true,
+      ruleInfo: `
+				用户在平台中对奖励提现的，适用以下规则：
+				<br/>
+				<br/>
+				1，用户的收益达到最低提现金额要求后，可以申请提现。每日发起前10笔提现为自动到账，超出则需第二个工作日后到账。
+				<br/>
+				2，用户需要通过支付宝提现，需按照要求绑定支付宝账号并填写提现金额或其他提现所需信息，请确保提供的信息准确无误，以免提现失败。
+				<br/>
+				3，如果用户发现显示「提现失败」，需确认当前填写或绑定的支付宝账号或银行卡账号是否正确，以及支付宝账号是否可用。如果用户发现显示「提现成功」但没到账
+				<br/>
+				(1)如果用户有多个支付宝账号，请检查用户是否提现到了其他支付宝账号。
+				<br/>
+				(2)高峰期提现人数多会导致网络拥堵，显示提现成功之后72小时内属于正常现象，请耐心等候。
+				<br/>
+				4，每日23:00至次日11:00为系统维护时间，活动的对应奖励可能延迟到账。提现通常会在72小时内到账，如遇双休日、节假日，提现到账时间可能会延长。活动高峰期间，由于网络拥堵，用户可能存在短时间内无法提现的情况。平台将尽最大努力及时恢复提现功能，但无需因此承担任何责任。
+				<br/>
+		`,
     };
   },
   onLoad() {
@@ -153,6 +182,7 @@ export default {
     this.aliZhiFuBao = uni.getStorageSync('zhiFuBao')
     this.aliZhiFuBaoName = uni.getStorageSync('zhiFuBaoName')
     this.ymfgetcashMoney()
+    this.getCanCash()
 
   },
   onReachBottom: function () {
@@ -170,6 +200,61 @@ export default {
     // this.list();
   },
   methods: {
+    onNavigationBarButtonTap() {
+      this.showRule()
+    },
+    showRule() {
+      this.ruleShow = true
+    },
+    /**
+       * 广告播放成功回调
+       * @param {Object} e
+       */
+    async onadclose(e) {
+      const detail = e.detail
+      if (detail && detail.isEnded) {
+        // 正常播放结束
+        let res = await this.$Request.getT('app/ad/state', {
+          extraKey: this.urlCallback.extra
+        })
+        this.getCanCash()
+      } else {
+        // 播放中途退出
+      }
+    },
+    /**
+   * 广告加载失败回调
+   * @param {Object} e
+   */
+    onaderror(e) {
+      if (this.adRewardedVideoloadNum >= 3) {
+        this.adRewardedVideo = false;
+        return
+      }
+      this.adRewardedVideoloadNum++
+      setTimeout(() => {
+        this.$refs.adRewardedVideo.load();
+      }, 1000); // 10
+      console.log("广告加载失败")
+    },
+    /**
+     * 广告数据加载成功回调
+     * @param {Object} e
+     */
+    onadload(e) {
+      this.adRewardedVideo = true;
+      console.log('广告数据加载成功');
+    },
+
+    getCanCash() {
+      this.$Request.getT('/app/cash/canCash').then(res => {
+        if (res.code == 0) {
+          this.isWithdraw = res.data;
+        } else {
+          this.isWithdraw = false;
+        }
+      })
+    },
     ymfmoneyInput(e) {
       let num = e.detail.value.match(/^\d*(\.?\d{0,2})/g)[0] || null;
       this.$nextTick(() => {
@@ -287,6 +372,16 @@ export default {
             setTimeout(function () {
               that.ymfgetcashMoney()
             }, 1500)
+          } else if (res.code == 9991) {
+            uni.showToast({
+              title: res.msg,
+              icon: 'none'
+            })
+            setTimeout(function () {
+              uni.navigateTo({
+                url: '/me/yaoqing/zhifubao-tixain'
+              });
+            }, 1500)
 
           } else {
             uni.showToast({
@@ -301,7 +396,22 @@ export default {
     ymfcheckMobile(money) {
       return RegExp(/^1[34578]\d{9}$/).test(money);
     },
+    withdraw() {
+      if (!this.isWithdraw) {
+        this.urlCallback = {
+          userId: this.userId,
+          extra: 'cash:' + this.userId + "" + new Date().getTime(),
+        }
+
+        this.$refs.adRewardedVideo.show();
+      } else {
+        this.ymfgetOut()
+      }
+
+    },
     ymfgetOut() {
+
+
       let that = this;
       let token = that.token
       let userId = that.userId
@@ -453,20 +563,40 @@ export default {
 <style lang="less">
 // @import '../../static/css/index.css';
 .top-bg {
-	background-color: #ff7581;height: 400upx;border-bottom-right-radius: 40upx;border-bottom-left-radius: 40upx;
+  background-color: #ff7581;
+  height: 400upx;
+  border-bottom-right-radius: 40upx;
+  border-bottom-left-radius: 40upx;
 }
+
 .class1 {
-	font-size: 32upx;color: #FFFFFF;padding-top: 100upx;
+  font-size: 32upx;
+  color: #FFFFFF;
+  padding-top: 100upx;
 }
+
 .class2 {
-	font-size: 40upx;color: #FFFFFF;padding-top: 20upx;
+  font-size: 40upx;
+  color: #FFFFFF;
+  padding-top: 20upx;
 }
+
 .class3 {
-	width: 90%;height: max-content;margin-left: 40upx;background-color: #FFFFFF;box-shadow: rgba(183, 183, 183, 0.3) 0px 1px 10px;margin-top: 50upx;border-radius: 20upx;
+  width: 90%;
+  height: max-content;
+  margin-left: 40upx;
+  background-color: #FFFFFF;
+  box-shadow: rgba(183, 183, 183, 0.3) 0px 1px 10px;
+  margin-top: 50upx;
+  border-radius: 20upx;
 }
+
 .class4 {
-	display: flex;flex-direction: row;padding: 20upx;
+  display: flex;
+  flex-direction: row;
+  padding: 20upx;
 }
+
 .view2-view-text {
   font-size: 14px;
   color: #000000;

me/yaoqing/zhifubao-tixain.vue

@@ -4,6 +4,7 @@
 
 		<list-cell title="支付宝账号" type="text" placeholder="请输入要绑定的支付宝手机号" v-model="zhiFuBao"></list-cell>
 
+		<list-cell title="身份证号码" type="text" placeholder="请输入要绑定身份证号码" v-model="certNum"></list-cell>
 
 		<button :class="zhiFuBao && zhiFuBaoName ? 'confirm-btn' : 'ymf-confirm-btn1'" @click="ymftoLogin"
 			:disabled="logining">绑定账户</button>
@@ -22,11 +23,14 @@
 		return {
 			zhiFuBao: '',
 			zhiFuBaoName: '',
-				logining: false
+			logining: false,
+			certNum: '',
+
 		}
 	},
 	onLoad() {
 		let userId = uni.getStorageSync('userId');
+		this.certNum = uni.getStorageSync('certNum')
 
 		if (userId) {
 			this.$u.api.userinfo().then(res => {
@@ -37,8 +41,9 @@
 					if (res.data.zhiFuBaoName) {
 						this.zhiFuBaoName = res.data.zhiFuBaoName;
 					}
-						// console.log(this.zhiFuBao )
+					if (res.data.certNo) {
-						// console.log(this.zhiFuBaoName )
+						this.certNum = res.data.certNo;
+					}
 				}
 			})
 		}
@@ -62,25 +67,32 @@
 			// } = this;
 			let zhiFuBao = this.zhiFuBao
 			let zhiFuBaoName = this.zhiFuBaoName
-				console.log(zhiFuBao)
+			let certNum = this.certNum
-				console.log(zhiFuBaoName)
+
 			if (!zhiFuBao) {
 				uni.showToast({
 					title: '请设置收款人姓名',
 					icon: 'none'
 				})
+			} else if (!certNum) {
+				uni.showToast({
+					title: '请设置收款人身份证账号',
+					icon: 'none'
+				})
 			} else if (!zhiFuBaoName) {
 				uni.showToast({
 					title: '请设置收款人支付宝账号',
 					icon: 'none'
 				})
 			} else {
-					this.$u.post('app/user/updateUser?zhiFuBao=' + zhiFuBao + '&zhiFuBaoName=' + zhiFuBaoName).then(
+				this.$u.post('app/user/updateUser?zhiFuBao=' + zhiFuBao + '&certName=' + zhiFuBaoName + '&certNum=' + certNum).then(
 					res => {
 						console.log(res);
 						if (res.code === 0) {
 							uni.setStorageSync('zhiFuBao', zhiFuBao)
 							uni.setStorageSync('zhiFuBaoName', zhiFuBaoName)
+							uni.setStorageSync('certNum', certNum)
+
 							uni.showToast({
 								title: '修改成功',
 								icon: 'none',

pages.json

@@ -10,7 +10,6 @@
 				"navigationBarTitleText": "任务",
 				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
-
 			}
 		},
 		{
@@ -26,7 +25,6 @@
 			"style": {
 				"navigationBarTitleText": "任务"
 				// "navigationStyle": "custom"
-
 			}
 		},
 		{
@@ -34,7 +32,6 @@
 			"style": {
 				"navigationBarTitleText": "任务",
 				"navigationStyle": "custom"
-
 			}
 		},
 		{
@@ -65,7 +62,8 @@
 				"enablePullDownRefresh": true,
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
-		}, {
+		},
+		{
 			"path": "pages/index/course/orderDet",
 			"style": {
 				"navigationBarTitleText": "确认订单",
@@ -79,8 +77,6 @@
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
 		},
-
-
 		{
 			"path": "pages/learn/index",
 			"style": {
@@ -111,8 +107,6 @@
 				}
 			}
 		},
-
-
 		{
 			"path": "pages/me/vip/index",
 			"style": {
@@ -124,8 +118,6 @@
 				}
 			}
 		},
-
-
 		{
 			"path": "pages/login/login",
 			"style": {
@@ -163,7 +155,8 @@
 					}
 				}
 			}
-		}, {
+		},
+		{
 			"path": "pages/login/bind",
 			"style": {
 				"navigationBarTitleText": "绑定手机号",
@@ -176,7 +169,6 @@
 		},
 		{
 			"path": "pages/login/register",
-
 			"style": {
 				"navigationBarTitleText": "",
 				"navigationBarBackgroundColor": "#f1a48a",
@@ -201,7 +193,8 @@
 					}
 				}
 			}
-		}, {
+		},
+		{
 			"path": "pages/yodwbsHlmJ/yodwbsHlmJ",
 			"style": {
 				"navigationBarTitleText": "追剧",
@@ -211,8 +204,8 @@
 				"navigationStyle": "custom"
 				// #endif
 			}
-
+		},
-		}, {
+		{
 			"path": "pages/yodwbsHlmJ/aaacasadwqvb",
 			"style": {
 				"navigationBarTitleText": "追剧as",
@@ -222,8 +215,8 @@
 				"navigationStyle": "custom"
 				// #endif
 			}
-
+		},
-		}, {
+		{
 			"path": "pages/video/video",
 			"style": {
 				"navigationBarTitleText": "推荐",
@@ -239,9 +232,7 @@
 					"video-player": "ext://industry/video-player"
 				}
 				// #endif
-
 			}
-
 		},
 		{
 			"path": "pages/login/appEq",
@@ -253,7 +244,8 @@
 				"navigationStyle": "custom"
 				// #endif
 			}
-		}, {
+		},
+		{
 			"path": "pages/login/iosmobile",
 			"style": {
 				"navigationBarTitleText": "手机号绑定"
@@ -308,38 +300,48 @@
 						"navigationBarTitleText": "意见反馈",
 						"navigationBarBackgroundColor": "#FFFFFF"
 					}
-				}, {
+				},
+				{
 					"path": "HEWZtgyqRH/HEWZtgyqRH",
 					"style": {
 						"navigationBarTitleText": "我的余额"
 					}
-				}, {
+				},
+				{
 					"path": "HEWZtgyqRH/YGivHgyqkI"
-				}, {
+				},
+				{
 					"path": "HEWZtgyqRH/EsBgyqacOi"
-				}, {
+				},
+				{
 					"path": "feedbackIndexczgw/issuer"
-				}, {
+				},
+				{
 					"path": "feedbackIndexczgw/Invoicedgoods"
-				}, {
+				},
+				{
 					"path": "feedback/toexamine"
-				}, {
+				},
+				{
 					"path": "feedback/orderinquiry"
-				}, {
+				},
+				{
 					"path": "feedbackIndexczgw/feedbackIndexczgw",
 					"style": {
 						"navigationBarTitleText": "帮助中心",
 						"enablePullDownRefresh": false,
 						"navigationBarBackgroundColor": "#FFFFFF"
 					}
-				}, {
+				},
+				{
 					"path": "helpDetail/helpDetail",
 					"style": {
 						"navigationBarTitleText": "帮助详情",
 						"enablePullDownRefresh": false,
 						"navigationBarBackgroundColor": "#FFFFFF"
 					}
-				}, {
+				},
+				{
 					"path": "message/duanju-message-home",
 					"style": {
 						"navigationBarTitleText": "消息中心"
@@ -396,9 +398,13 @@
 					"path": "yaoqing/ymg-yaoqing-tixian",
 					"style": {
 						"navigationBarTitleText": "申请提现",
-						"h5": {
+						// "navigationStyle": "custom",
+						"app-plus": {
 							"titleNView": {
-								"backgroundColor": "#FFFFFF"
+								"buttons": [{
+									"text": "规则",
+									"fontSize": "30rpx"
+								}]
 							}
 						}
 					}
@@ -475,7 +481,8 @@
 							}
 						}
 					}
-				}, {
+				},
+				{
 					"path": "setting/kefu",
 					"style": {
 						"navigationBarTitleText": "客服",
@@ -525,8 +532,8 @@
 							}
 						}
 					}
-				}, {
+				},
-
+				{
 					"path": "detail/detail",
 					"style": {
 						"navigationBarTitleText": "",
@@ -565,12 +572,9 @@
 							"video-player": "ext://industry/video-player"
 						}
 						// #endif
-
-
 					}
-
+				},
-				}, {
+				{
-
 					"path": "detail/detailIOS",
 					"style": {
 						"navigationBarTitleText": "",
@@ -609,45 +613,42 @@
 							"video-player": "ext://industry/video-player"
 						}
 						// #endif
-
-
 					}
-
+				},
-				}, {
+				{
 					"path": "FrdwbsihPr/FrdwbsihPr",
 					"style": {
 						"navigationBarTitleText": "金币充值",
 						"enablePullDownRefresh": false
 					}
-
+				},
-				}, {
+				{
 					"path": "FrdwbsihPr/RSKjJIdwbH",
 					"style": {
 						"navigationBarTitleText": "金币明细",
 						"enablePullDownRefresh": true
 					}
-
+				},
-				}, {
+				{
 					"path": "jilu/duanju-zuijin-guankan",
 					"style": {
 						"navigationBarTitleText": "最近观看",
 						"enablePullDownRefresh": true
 					}
-
+				},
-				}, {
+				{
 					"path": "jilu/duanju-zhjuiju-jilu",
 					"style": {
 						"navigationBarTitleText": "追剧记录",
 						"enablePullDownRefresh": true
 					}
-
+				},
-				}, {
+				{
 					"path": "jifen/duanju-jifen",
 					"style": {
 						"navigationBarTitleText": "我的积分",
 						"enablePullDownRefresh": false
 					}
-
 				},
 				{
 					"path": "jifen/duanju-jifen-duihuan",
@@ -655,14 +656,13 @@
 						"navigationBarTitleText": "积分兑换",
 						"enablePullDownRefresh": false
 					}
-
+				},
-				}, {
+				{
 					"path": "jilu/duanju-love",
 					"style": {
 						"navigationBarTitleText": "我的喜欢",
 						"enablePullDownRefresh": true
 					}
-
 				},
 				{
 					"path": "jilu/new/fensehn-first",
@@ -670,7 +670,6 @@
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": true
 					}
-
 				},
 				{
 					"path": "jilu/new/free-create-fenshen",
@@ -678,7 +677,6 @@
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": true
 					}
-
 				},
 				{
 					"path": "jifen/new/create-zhuanye-fenshen",
@@ -686,7 +684,6 @@
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": false
 					}
-
 				},
 				{
 					"path": "jifen/new/fenshen-detail",
@@ -694,7 +691,6 @@
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": false
 					}
-
 				},
 				{
 					"path": "payOrder/duanju-xiadan",
@@ -702,7 +698,6 @@
 						"navigationBarTitleText": "下单",
 						"enablePullDownRefresh": false
 					}
-
 				},
 				{
 					"path": "payOrder/new/index",
@@ -710,7 +705,6 @@
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": false
 					}
-
 				},
 				{
 					"path": "payOrder/new/newindex",
@@ -718,7 +712,6 @@
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": false
 					}
-
 				},
 				{
 					"path": "setting/logOff",
@@ -726,15 +719,15 @@
 						"navigationBarTitleText": "注销账号",
 						"enablePullDownRefresh": false
 					}
-
+				},
-				}, {
+				{
 					"path": "setting/offXieyi",
 					"style": {
 						"navigationBarTitleText": "用户注销协议",
 						"enablePullDownRefresh": false
 					}
-
+				},
-				}, {
+				{
 					"path": "juqing/duanju-juqing-home",
 					"style": {
 						"navigationBarTitleText": "剧情介绍",
@@ -747,7 +740,6 @@
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": true
 					}
-
 				},
 				{
 					"path": "juqing/new/waiting-result",
@@ -755,14 +747,13 @@
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": true
 					}
-
+				},
-				}, {
+				{
 					"path": "mFYpdwbMdk/mFYpdwbMdk",
 					"style": {
 						"navigationBarTitleText": "壁纸",
 						"enablePullDownRefresh": true
 					}
-
 				},
 				{
 					"path": "rHTgyqGoIV/rHTgyqGoIV",
@@ -845,9 +836,7 @@
 				"style": {
 					"navigationBarTitleText": "支付成功"
 				}
-				}
+			}]
-
-			]
 		},
 		{
 			"root": "other",
@@ -887,7 +876,6 @@
 					"style": {
 						"navigationBarTitleText": "抽奖",
 						"navigationStyle": "custom"
-
 					}
 				},
 				{
@@ -924,24 +912,20 @@
 						"navigationStyle": "custom"
 					}
 				}
-
 			]
 		}
 	],
-
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "短剧",
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#F8F8F8"
-
 	},
 	"tabBar": {
 		"color": "#333333",
 		"selectedColor": "#FF7581",
 		"backgroundColor": "#FFFFFF",
 		"borderStyle": "black",
-
 		"list": [{
 				"pagePath": "pages/index/index2",
 				"iconPath": "static/tabbar/index@2x.png",
@@ -961,14 +945,12 @@
 			// 	"text": "刷剧"
 			// }
 			// ,
-
 			// {
 			// 	"pagePath": "pages/video/video",
 			// 	"iconPath": "static/tabbar/learn@2x.png",
 			// 	"selectedIconPath": "static/tabbar/learn_@2x.png",
 			// 	"text": "推荐"
 			// },
-
 			// {
 			// 	"pagePath": "pages/chasingDrama/chasingDrama",
 			// 	"iconPath": "static/tabbar/zhuiju.png",

pages/index/index2.vue

@@ -29,27 +29,43 @@
 			</template>
 		</view>
 		<view style="display: flex;align-items: center;justify-content: space-between;padding:0 20rpx;">
-			<view style="background-color: #f0f0f0;margin-left:20rpx;padding:6rpx 20rpx" :style="active==1?'color:#ff6b7f':''" @tap="getrecomVideo('',1)">
+			<view style="background-color: #f0f0f0;margin-left:20rpx;padding:6rpx 20rpx"
+				:style="active == 1 ? 'color:#ff6b7f' : ''" @tap="getrecomVideo('', 1)">
 				最新
 			</view>
-			<view style="background-color: #f0f0f0;margin-left:20rpx;padding:6rpx 20rpx" :style="active==2?'color:#ff6b7f':''" @tap="getrecomVideo('1',2)">
+			<view style="background-color: #f0f0f0;margin-left:20rpx;padding:6rpx 20rpx"
+				:style="active == 2 ? 'color:#ff6b7f' : ''" @tap="getrecomVideo('1', 2)">
 				排行
 			</view>
-			<view style="background-color: #f0f0f0;margin-left:20rpx;padding:6rpx 20rpx" :style="active==3?'color:#ff6b7f':''" @tap="getrecomVideo('2',3)">
+			<view style="background-color: #f0f0f0;margin-left:20rpx;padding:6rpx 20rpx"
+				:style="active == 3 ? 'color:#ff6b7f' : ''" @tap="getrecomVideo('2', 3)">
 				最热
 			</view>
-			<view style="background-color: #f0f0f0;margin-left:20rpx;padding:6rpx 20rpx" :style="active==4?'color:#ff6b7f':''" @tap="getrecomVideo('1',4)">
+			<view style="background-color: #f0f0f0;margin-left:20rpx;padding:6rpx 20rpx"
+				:style="active == 4 ? 'color:#ff6b7f' : ''" @tap="getrecomVideo('1', 4)">
 				剧情
 			</view>
-			<view style="background-color: #f0f0f0;margin-left:20rpx;padding:6rpx 20rpx" :style="active==5?'color:#ff6b7f':''" @tap="getrecomVideo('2',5)">
+			<view style="background-color: #f0f0f0;margin-left:20rpx;padding:6rpx 20rpx"
+				:style="active == 5 ? 'color:#ff6b7f' : ''" @tap="getrecomVideo('2', 5)">
 				飙升
 			</view>
 		</view>
 		<view class="">
 			<contentlist :list='list'></contentlist>
 		</view>
-		<u-image v-if="isShowMoneyPay" @click="goMsg('/me/VjgyqAzklr/VjgyqAzklr')" :src="`../../static/red-pack-new.gif`"
+		<u-image v-if="isShowMoneyPay" @click="goMsg('/me/VjgyqAzklr/VjgyqAzklr')"
+			:src="`../../static/red-pack-new.gif`"
 			style="width: 200rpx;height: 200rpx;position: fixed;right: 10rpx;bottom: 180rpx;"></u-image>
+
+		<u-modal v-model="ruleShow" confirm-text="知道了" :title="rule_title" :title-style="{ fontWeight: '700' }"
+			confirm-color="rgb(255, 117, 129)">
+			<view class="u-p-30 u-text-left">
+				<scroll-view scroll-y="true" style="max-height: 50vh;">
+					<rich-text class="color-666" :nodes="rule_content"></rich-text>
+				</scroll-view>
+			</view>
+
+		</u-modal>
 	</view>
 </template>
 
@@ -67,6 +83,10 @@
 			page: 1,
 			active: 1,
 			isShowMoneyPay: true,
+			ruleShow: false,
+			rule_title: '',
+			rule_content: '',
+
 		}
 	},
 	onShow() {
@@ -81,6 +101,16 @@
 				this.isShowMoneyPay = !(res.data.value == '1' && isIos)
 			}
 		});
+
+		httpsRequest.getT("/app/announcement", {}).then(res => {
+			if (res.code == 0) {
+				if (res.data && res.data.state == 1) {
+					this.ruleShow = true
+					this.rule_title = res.data.title
+					this.rule_content = res.data.content
+				}
+			}
+		});
 	},
 	onReachBottom() {
 		++this.page

pages/login/login.vue

@@ -286,6 +286,7 @@ export default {
 				})
 				this.$u.post('/app/Login/registerCode?password=' + code + '&phone=' + mobile).then(res => {
 					if (res.code === 0) {
+						console.log(res,'userid1')
 						uni.setStorageSync('token', res.token)
 						uni.setStorageSync('userId', res.user.userId)
 						uni.setStorageSync('userName', res.user.userName)