Merge branch 'dev_1.3' of http://222.85.201.140:10002//xuyunhui/chain_jje_uniapp into dev1.4

 Conflicts:

	orderPages/bookService/index.vue

	pages/my/index.vue

common/js/api.js

@@ -537,12 +537,20 @@ export default {
     // get请求，获取手机验证码
     getSmsCode(data) {
         return request({
-            url: '/resource/sms/code',
+            url: '/resource/sms/codeByType',
             method: 'GET',
             data: data
         })
     },
 
+    //get请求，获取手机验证码 新模板
+    getSmsCodeByType(data) {
+        return request({
+            url: '/resource/sms/codeByType',
+            method: 'GET',
+            data: data
+        })
+    },
     // post请求，验证手机验证码
     validateSmsCode(data) {
         return request({

components/pay/pay.vue

@@ -17,7 +17,7 @@
 							<u-icon name="/static/me/u701.png" color="#38db38" size="36"></u-icon>
 							<view class="payName flex-col justify-center">
 								<text>余额支付</text>
-								<text class="balance">可以余额￥{{balance}}</text>
+								<text class="balance">可用余额￥{{balance}}</text>
 							</view>
 						</view>
 						<view class="flex-col justify-center">

myPages/setting/setting-telphone.vue

@@ -54,14 +54,14 @@
             </template>
 
           </u-form-item>
-<!--          <view style="font-size: 26rpx">-->
-<!--            请输入您在娇骄儿的会员手机号，如需要找回账号请点击-->
-<!--            <navigator url="/loginPages/login/retrieve-account">-->
-<!--              <text style="color: #007aff">找回账号</text>-->
-<!--              。-->
-<!--            </navigator>-->
+          <!--          <view style="font-size: 26rpx">-->
+          <!--            请输入您在娇骄儿的会员手机号，如需要找回账号请点击-->
+          <!--            <navigator url="/loginPages/login/retrieve-account">-->
+          <!--              <text style="color: #007aff">找回账号</text>-->
+          <!--              。-->
+          <!--            </navigator>-->
 
-<!--          </view>-->
+          <!--          </view>-->
 
         </u--form>
       </view>
@@ -76,7 +76,23 @@
         <text>确定</text>
       </view>
     </view>
-
+    <!--    确认绑定弹框-->
+    <uni-popup ref="popupMigrate" :isMaskClick="false">
+      <view class="popup-content">
+        <view style="text-align: center">
+          <view class="text">当前会员编号为{{ storageUserInfo.no }}</view>
+          <text class="text">是否确认与该会员绑定并获取验证码？</text>
+        </view>
+        <view style="height:10px"></view>
+        <view class="button-popup">
+          <button class="h-btn" style="background-color: #EEEEEE;" @click="popupClose()">取消</button>
+          <view class="h-btn" style="background-color: #FFE05C;" @click="getPhoneCode()"
+                :disabled="currentStep === steps.length - 1">
+            <text>确定</text>
+          </view>
+        </view>
+      </view>
+    </uni-popup>
 
   </view>
 </template>
@@ -99,6 +115,7 @@ export default {
         type: '' // 实名认证创建新账号
       },
       tips2: '',
+      storageUserInfo:{},
       rules: {
         phonenumber: [
           {
@@ -129,12 +146,15 @@ export default {
     }
   },
   onLoad(option) {
+    this.storageUserInfo = uni.getStorageSync('userInfo')
   },
   onReady() {
     this.$refs.form1.setRules(this.rules)
   },
   methods: {
-
+    popupClose(){
+      this.$refs.popupMigrate.close()
+    },
     getUserInfo() {
       this.$api.getUserInfo().then(res => {
         uni.setStorageSync('userInfo', res.data.data)
@@ -180,16 +200,18 @@ export default {
     },
     // 获取手机验证码
     getSmsCode() {
-      console.log('cacacacacacaca',this.userInfo)
+      console.log('cacacacacacaca', this.userInfo)
       let that = this;
       if (!this.userInfo.phonenumber) {
         uni.$u.toast('请认真填写手机号');
         return;
       }
 
+
       // 验证电话号码是否存在
       this.$api.phoneIsExist(this.userInfo).then((res) => {
-        if (res.phoneIsExist) { // 存在
+        console.log(res.data.data.phoneIsExist)
+        if (res.data.data.phoneIsExist) { // 存在
           that.errTipShow = true;
           setTimeout(() => {
             that.errTipShow = false;
@@ -197,7 +219,8 @@ export default {
             that.userInfo.phonenumber = null;
           }, 3000);
         } else {
-          that.getPhoneCode();
+          this.$refs.popupMigrate.open()
+          // that.getPhoneCode();
         }
       }).catch(() => {
         uni.showToast({
@@ -205,17 +228,18 @@ export default {
           duration: 3000
         })
       });
+    },
 
 
-    },
     // 获取验证码
     getPhoneCode() {
       let that = this;
+      that.$refs.popupMigrate.close()
       // 模拟向后端请求验证码
       uni.showLoading({
         title: '正在获取验证码'
       })
-      this.$api.getSmsCode({phonenumber: this.userInfo.phonenumber, auth: true}).then((res) => {
+      this.$api.getSmsCodeByType({phonenumber: this.userInfo.phonenumber, auth: true, type: 0}).then((res) => {
         uni.hideLoading();
         // 这里此提示会被this.start()方法中的提示覆盖
         uni.$u.toast('验证码已发送');
@@ -231,6 +255,7 @@ export default {
 }
 </script>
 <style lang="scss">
+
 page, body {
   background: #fff;
 }
@@ -331,4 +356,66 @@ page, body {
     }
   }
 }
+
+.popup-content {
+  width: 622rpx;
+  background-color: #FFFFFF;
+  border-radius: 20rpx;
+  padding: 24rpx;
+
+  .popupItem {
+    width: 558rpx;
+    height: 100rpx;
+    background-color: #FAFAFA;
+    border-radius: 16rpx;
+    margin:24rpx ;
+    display: flex;
+    align-items: center;
+    justify-content: space-around;
+  }
+  .popupItemSelect {
+    width: 558rpx;
+    height: 100rpx;
+    background-color: #FAFAFA;
+    border-radius: 16rpx;
+    border: 4rpx solid #FFE05C;
+    margin:24rpx ;
+    display: flex;
+    align-items: center;
+    justify-content: space-around;
+    box-sizing: border-box;
+  }
+  .popupItemSelect::after {
+    content: '√';
+    color: #fff;
+    z-index: 1000;
+    display: inline-block;
+    width: 32rpx;
+    height: 32rpx;
+    transform: rotate(20deg);
+    position: absolute;
+    top: 0;
+    right: 0;
+  }
+
+}
+
+.button-popup {
+  height: 60px;
+  display: flex;
+  justify-content: space-between;
+  background: #fff;
+
+  .h-btn {
+    margin: 0 auto;
+    margin-top: 8px;
+    width: 240rpx;
+    height: 84rpx;
+    border-radius: 27px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 14px;
+  }
+}
 </style>

myPages/systemSwitch/index.vue

@@ -186,7 +186,7 @@
       <uni-popup ref="popup" :isMaskClick="false">
         <view class="popup-content">
           <view style="text-align: center">
-            <text class="text" >选择会员编号</text>
+            <text class="text">选择会员编号</text>
           </view>
           <view v-for="item in numberList">
             <view class="popupItem" :class="{'popupItemSelect':item.isSelect == true }" @click="SelectItem(item)"
@@ -209,15 +209,17 @@
         </view>
       </uni-popup>
     </view>
-<!--   确认迁移弹框 -->
+
+    <!--   确认迁移弹框 -->
     <uni-popup ref="popupMigrate" :isMaskClick="false">
       <view class="popup-content">
         <view style="text-align: center">
-          <text class="text" >您确定要迁移资产？</text>
+          <view class="text">当前会员编号为{{ storageUserInfo.no }}</view>
+          <text class="text">是否确认找回到该账号下？</text>
         </view>
-        <view style="height:40px" ></view>
+        <view style="height:10px"></view>
         <view class="button-popup">
-          <button class="h-btn" style="background-color: #EEEEEE;" @click="this.$refs.popupMigrate.close()">取消</button>
+          <button class="h-btn" style="background-color: #EEEEEE;" @click="popupClose()">取消</button>
           <view class="h-btn" style="background-color: #FFE05C;" @click="nextStep(4)"
                 :disabled="currentStep === steps.length - 1">
             <text>确定</text>
@@ -230,6 +232,7 @@
 
 <script>
 import signature from '../components/sign/sign';
+
 export default {
   components: {
     signature
@@ -239,7 +242,7 @@ export default {
       isCommit: 0,
       isSelect: false,
       isShow: true,
-      isMigrateClick:false,
+      isMigrateClick: false,
       showCanvas: false,
       numberList: [],
       currentStep: 0,
@@ -311,6 +314,7 @@ export default {
       signType: '',
       signImg1: '',
       tips2: '',
+      storageUserInfo:{},
       rules: {
         phone: [
           {
@@ -380,8 +384,11 @@ export default {
   },
 
   onLoad() {
+    // 用户信息
+    this.storageUserInfo = uni.getStorageSync('userInfo')
     // 获取服务条款数据
     // this.getTermOfServiceByType();
+    // this.$refs.popupMigrate.open()
   },
 
   onUnload() {
@@ -396,10 +403,14 @@ export default {
   },
 
   methods: {
+    popupClose(){
+      this.$refs.popupMigrate.close()
+    },
+
     SelectItem(data) {
       this.isSelect = true
       this.userMemberInfo = data
-      console.log(this.userMemberInfo,'33333333')
+      console.log(this.userMemberInfo, '33333333')
       this.isCommit = this.userMemberInfo.isCommit
       this.numberList.forEach(e => {
         e.isSelect = false
@@ -450,7 +461,7 @@ export default {
       uni.showLoading({
         title: '正在获取验证码'
       })
-      this.$api.getSmsCode({phonenumber: this.userInfo.phone, auth: true}).then((res) => {
+      this.$api.getSmsCodeByType({phonenumber: this.userInfo.phone, auth: true, type: 1}).then((res) => {
         uni.hideLoading();
         // 这里此提示会被this.start()方法中的提示覆盖
         uni.$u.toast('验证码已发送');
@@ -481,7 +492,7 @@ export default {
             console.log(this.numberList, '1111111')
             this.userMemberInfo = res.data.data[0]
             this.isCommit = res.data.data[0].isCommit
-            console.log(this.isCommit,'9999999999')
+            console.log(this.isCommit, '9999999999')
             if (this.currentStep < this.steps.length - 1) {
               this.currentStep++;
               this.getOrderRechargeOldList()
@@ -560,9 +571,9 @@ export default {
         if (this.isSelect === true) {
           this.$refs.popup.close()
           // this.getOldMember();
-          if (this.currentServiceTab == 'orderTab1'){
+          if (this.currentServiceTab == 'orderTab1') {
             this.getOrderRechargeOldList()
-          }else {
+          } else {
             this.getOrderConsumeLogOld();
           }
           if (this.currentStep < this.steps.length - 1) {
@@ -580,12 +591,12 @@ export default {
       if (idx == 1) { // 点击查询数据
         const userInfo = uni.getStorageSync('userInfo')
         // console.log(userInfo,'绑定手机号')
-        if (!userInfo.phone){
+        if (!userInfo.phone) {
           uni.showModal({
-            title:'温馨提示',
-            content:'资产找回涉及资金安全，需绑定手机号才能进行查询，是否确认绑定手机号',
-            success:res=>{
-              if (res.confirm){
+            title: '温馨提示',
+            content: '资产找回涉及资金安全，需绑定手机号才能进行查询，是否确认绑定手机号',
+            success: res => {
+              if (res.confirm) {
                 uni.navigateTo({
                   url: '/myPages/setting/setting-telphone',
                 })

myPages/transactionRecord/module/index.rpx.css

@@ -52,3 +52,6 @@
 .backColor3{
     background: #FFAF36;
 }
+.backColor4{
+    background: #36f262;
+}

myPages/transactionRecord/module/mescrollUni-item.vue

@@ -11,16 +11,14 @@
 
 			<view class="item" v-for="(item,index) in list" :key="index">
 				<view class="flex-row justify-between" @click="goOrderDetail(item)">
-					<view class="leftText" :class="{'backColor1':item.tradeNoType == '1','backColor2':item.tradeNoType == '2','backColor3':item.tradeNoType == '3'}">
-						<text v-if="item.tradeNoType == '1'">减少</text>
-						<text v-if="item.tradeNoType == '2'">增加</text>
-						<text v-if="item.tradeNoType == '3'">减少</text>
-						<text v-if="item.tradeNoType == '4'">增加</text>
+					<view class="leftText" :class="{'backColor1':item.tradeNoType == '1','backColor2':item.tradeNoType == '2','backColor3':item.tradeNoType == '3','backColor4':item.tradeNoType == '4' }">
+						<text v-if="item.tradeType == '1'">增加</text>
+						<text v-if="item.tradeType == '2'">减少</text>
 					</view>
 					<view class="rightText flex-col">
 						<view class=" flex-row justify-between">
 							<text class="text1">{{item.remark}}</text>
-							<text class="text2" v-if="item.tradeNoType == '2'">{{item.amount}}</text>
+							<text class="text2" v-if="item.tradeType == '1'">{{item.amount}}</text>
 							<text class="text2" v-else>-{{item.amount}}</text>
 						</view>
 						<view class=" flex-row justify-between">

myPages/userInfo/index.vue

@@ -30,6 +30,14 @@
 					<input type="nickname" name="nickname" v-model="userInfo.ncikName"   placeholder="请输入昵称"/>
 				</view>
 			</view>
+        <view class="flex-row justify-between bordBot" >
+          <view class="key flex-col justify-center ">
+            <text>会员编号</text>
+          </view>
+          <view class="nikeName flex-col justify-center">
+            <input type="nickname" name="nickname" v-model="userInfo.no"   placeholder="请输入昵称"/>
+          </view>
+        </view>
 
 			<view class="flex-row justify-between bordBot" >
 				<view class="key flex-col justify-center ">

orderPages/bookService/index.vue

@@ -139,7 +139,7 @@
 				</view>
 			</view>
 		</view>
-		<myPay ref="myPay" :orderNo="subOrderNo" @payResult="payResult" @improperClose="improperClose"></myPay>
+		<myPay ref="myPay" :selectBlPay="userInfo.balance >= price" :balance="userInfo.balance"  :orderNo="subOrderNo" @payResult="payResult" @improperClose="improperClose"></myPay>
 	</view>
 </template>
 

pages/my/index.vue

@@ -12,11 +12,7 @@
           </view>
           <view class="userTitle flex-col justify-center" @click="navigateToPage('/myPages/userInfo/index')">
             <text class="nickName">HI,亲爱的{{ userInfo.ncikName }}</text>
-            <text class="xinxTitle">{{ userInfo.no }}</text>
-<!--            <view class="flex-row">-->
-<!--              <text class="xinxTitle">点击完善个人信息</text>-->
-<!--              <u-icon name="arrow-right" color="#333333" size="16"></u-icon>-->
-<!--            </view>-->
+            <text class="xinxTitle">{{userInfo.no}}</text>
           </view>
         </view>
 

pages/order/index.rpx.scss

@@ -185,6 +185,7 @@
 
         .content {
           width: 100%;
+          height: 100vh;
           padding-left: 16rpx;
           padding-top: 4rpx;
           padding-right: 24rpx;

pages/order/index.vue

@@ -77,7 +77,7 @@
 
 				<view :style="{'height':'380rpx'}">
 
-					<view class="payItem flex-row justify-between" v-if="openType!=2"   @click="payItem(1)">
+					<view class="payItem flex-row justify-between"  @click="payItem(1)">
 						<view class="flex-row">
 							<u-icon name="/static/me/u701.png" color="#38db38" size="36"></u-icon>
 							<view class="payName flex-col justify-center">