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

loginPages/login/login-real-name-auth.vue

@@ -1,103 +1,103 @@
 <template>
 	<view class="keep-on-record-wrap">
 		<!-- 提示内容 -->
-		<u-toast ref="uToast" />
+<!--		<u-toast ref="uToast" />-->
 
-		<view class="keep-on-record-content">
-			<view class="container">
-				<view class="login-wrap">
-					<view class="login-form">
-						<u--form
-							labelPosition="left"
-							:model="userRealNameAuth"
-							:rules="rules"
-							ref="form1"
-						>
-							<u-form-item
-								label="真实姓名"
-								prop="name"
-								labelWidth="auto"
-								labelAlign="right"
-							  >
-							<u--input
-								v-model="userRealNameAuth.name"
-								placeholder="请输入真实姓名"
-								border="bottom"
-								type="text"
-								maxlength="11"
-							></u--input>
-						  </u-form-item>
-						  <u-form-item
-								labelWidth="auto"
-								labelAlign="right"
-								label="身份证号"
-								prop="idCard"
-								width="120"
-							>
-							<u--input
-								v-model="userRealNameAuth.idCard"
-								disabledColor="#ffffff"
-								placeholder="请输入身份证号"
-								border="bottom"
-								maxlength="20"
-							></u--input>
-						  </u-form-item>
-						</u--form>
-					</view>
-				</view>
+<!--		<view class="keep-on-record-content">-->
+<!--			<view class="container">-->
+<!--				<view class="login-wrap">-->
+<!--					<view class="login-form">-->
+<!--						<u&#45;&#45;form-->
+<!--							labelPosition="left"-->
+<!--							:model="userRealNameAuth"-->
+<!--							:rules="rules"-->
+<!--							ref="form1"-->
+<!--						>-->
+<!--							<u-form-item-->
+<!--								label="真实姓名"-->
+<!--								prop="name"-->
+<!--								labelWidth="auto"-->
+<!--								labelAlign="right"-->
+<!--							  >-->
+<!--							<u&#45;&#45;input-->
+<!--								v-model="userRealNameAuth.name"-->
+<!--								placeholder="请输入真实姓名"-->
+<!--								border="bottom"-->
+<!--								type="text"-->
+<!--								maxlength="11"-->
+<!--							></u&#45;&#45;input>-->
+<!--						  </u-form-item>-->
+<!--						  <u-form-item-->
+<!--								labelWidth="auto"-->
+<!--								labelAlign="right"-->
+<!--								label="身份证号"-->
+<!--								prop="idCard"-->
+<!--								width="120"-->
+<!--							>-->
+<!--							<u&#45;&#45;input-->
+<!--								v-model="userRealNameAuth.idCard"-->
+<!--								disabledColor="#ffffff"-->
+<!--								placeholder="请输入身份证号"-->
+<!--								border="bottom"-->
+<!--								maxlength="20"-->
+<!--							></u&#45;&#45;input>-->
+<!--						  </u-form-item>-->
+<!--						</u&#45;&#45;form>-->
+<!--					</view>-->
+<!--				</view>-->
 
 
-				<view class="">
-					<view class="uploadBox">
-						<view @click="uploadImg1(1)">
-							<view class="uploadItem bg-img1">
-								<image class="imgUrl" :src="imgUrl1"></image>
-							</view>
-							<view class="h-desc">
-								<text>点击上传身份证人像面图片</text>
-							</view>
-						</view>
-						<view @click="uploadImg1(2)">
-							<view class="uploadItem bg-img2">
-								<image class="imgUrl" :src="imgUrl2"></image>
-							</view>
-							<view class="h-desc">
-								<text>点击上传身份证国徽面图片</text>
-							</view>
-						</view>
-					</view>
-				</view>
+<!--				<view class="">-->
+<!--					<view class="uploadBox">-->
+<!--						<view @click="uploadImg1(1)">-->
+<!--							<view class="uploadItem bg-img1">-->
+<!--								<image class="imgUrl" :src="imgUrl1"></image>-->
+<!--							</view>-->
+<!--							<view class="h-desc">-->
+<!--								<text>点击上传身份证人像面图片</text>-->
+<!--							</view>-->
+<!--						</view>-->
+<!--						<view @click="uploadImg1(2)">-->
+<!--							<view class="uploadItem bg-img2">-->
+<!--								<image class="imgUrl" :src="imgUrl2"></image>-->
+<!--							</view>-->
+<!--							<view class="h-desc">-->
+<!--								<text>点击上传身份证国徽面图片</text>-->
+<!--							</view>-->
+<!--						</view>-->
+<!--					</view>-->
+<!--				</view>-->
 
-				<!-- 保存备案信息 -->
-				<view class="uploadBox">
-					<view  v-if="userRealNameAuth.isAudit != 1" @click="saveUserRealNameAuth" class="leftBtn text-white text-lg text-center">下一步</view>
-					<view  v-else  class="leftBtn text-white text-lg text-center">审核中不允许修改</view>
-				</view>
+<!--				&lt;!&ndash; 保存备案信息 &ndash;&gt;-->
+<!--				<view class="uploadBox">-->
+<!--					<view  v-if="userRealNameAuth.isAudit != 1" @click="saveUserRealNameAuth" class="leftBtn text-white text-lg text-center">下一步</view>-->
+<!--					<view  v-else  class="leftBtn text-white text-lg text-center">审核中不允许修改</view>-->
+<!--				</view>-->
 
-			</view>
-		</view>
+<!--			</view>-->
+<!--		</view>-->
 
-		<view class="footer"></view>
+<!--		<view class="footer"></view>-->
 
-		<u-popup :show="errShow" :round="10"  mode="center" >
-		  <view class="h-popo-content">
-			   <view class="h-img">
-				   <!-- <u-icon name="close" color="red" size="40"></u-icon> -->
-				   <u-icon name="/static/login/u01.png" color="red" size="50"></u-icon>
-			   </view>
-			   <view class="h-text">
-				   <text>该身份证号已开通实名认证</text>
-			   </view>
-			   <view class="h-text">
-			   		<text>无法继续操作</text>
-			   </view>
-			   <view class="h-btn-wrap">
-				   <view @click="surebtn()" class="h-right-btn">
-					   <text>确定</text>
-				   </view>
-			   </view>
-		  </view>
-		</u-popup>
+<!--		<u-popup :show="errShow" :round="10"  mode="center" >-->
+<!--		  <view class="h-popo-content">-->
+<!--			   <view class="h-img">-->
+<!--				   &lt;!&ndash; <u-icon name="close" color="red" size="40"></u-icon> &ndash;&gt;-->
+<!--				   <u-icon name="/static/login/u01.png" color="red" size="50"></u-icon>-->
+<!--			   </view>-->
+<!--			   <view class="h-text">-->
+<!--				   <text>该身份证号已开通实名认证</text>-->
+<!--			   </view>-->
+<!--			   <view class="h-text">-->
+<!--			   		<text>无法继续操作</text>-->
+<!--			   </view>-->
+<!--			   <view class="h-btn-wrap">-->
+<!--				   <view @click="surebtn()" class="h-right-btn">-->
+<!--					   <text>确定</text>-->
+<!--				   </view>-->
+<!--			   </view>-->
+<!--		  </view>-->
+<!--		</u-popup>-->
 
 	</view>
 </template>

myPages/recharge/index.vue

@@ -99,7 +99,7 @@
 						<u-icon name="rmb" color="#333" size="22"></u-icon>
 					</view>
 					<view class="h-money">
-						<input v-model="reqOrderParm.rechargeAmount" @click="cancelChooseMoney" placeholder="请输入金额" type="number">
+						<input v-model="reqOrderParm.rechargeAmount"  @click="cancelChooseMoney"  placeholder="请输入金额" type="number">
 					</view>
 				</view>
 
@@ -187,7 +187,6 @@
 			this.userInfo = uni.getStorageSync('userInfo');
 		},
 		methods: {
-
 			AboutByType(type) {
 				this.$api.AboutByType({type:9}).then(res => {
 					this.aboutContent = res.data.data.aboutContent
@@ -203,6 +202,7 @@
 			},
 			// 提交订单
 			submitOrder(){
+
         const that = this;
 				if(!this.isSelected){ // 是否确定协议
 					uni.showToast({
@@ -221,9 +221,17 @@
 				}
 
         if(!this.reqOrderParm.strategyId){
+          if(this.reqOrderParm.rechargeAmount <1 ||this.reqOrderParm.rechargeAmount>100){
+            console.log(1111111111)
+            uni.showToast({
+              icon: 'none',
+              title: '任意充金额须在1-100之间'
+            });
+            return;
+          }
           uni.showModal({
             title: '警告！',
-            content: '您选择任意金额充值不会获得任何优惠，是否确认充值',
+            content: '您选择任意充不会获得任何优惠，是否确认充值？？',
             success: function (res) {
               if (res.confirm) {
                 console.log('用户点击确定');

myPages/serviceObjectFaceAuth/index.vue

@@ -2,9 +2,9 @@
   <view class="container" :style="{'height':'100vh'}">
     <!-- 提示内容 -->
 
-    <view class="h-title">
-      <text>*请选择1张服务对象照片</text>
-    </view>
+<!--    <view class="h-title">-->
+<!--      <text>*请选择1张服务对象头像</text>-->
+<!--    </view>-->
 
     <view class="h-upload-wrap">
       <view class="h-item-row">
@@ -12,7 +12,7 @@
           <view v-if="!facePhotoUrl" class="h-content">
             <image src="/static/me/u01.png" mode="aspectFill"></image>
             <view class="h-text">
-              <text>添加照片</text>
+<!--              <text>添加头像</text>-->
             </view>
           </view>
           <view v-else class="h-upload-img">

myPages/systemSwitch/index.vue

@@ -215,6 +215,7 @@
         <view style="text-align: center">
           <text class="text" >您确定要迁移资产？</text>
         </view>
+        <view style="height:40px" ></view>
         <view class="button-popup">
           <button class="h-btn" style="background-color: #EEEEEE;" @click="this.$refs.popupMigrate.close()">取消</button>
           <view class="h-btn" style="background-color: #FFE05C;" @click="nextStep(4)"

pages.json

@@ -82,13 +82,13 @@
 						"enablePullDownRefresh": false
 					}
 				},
-				{
-					"path": "login/login-real-name-auth",
-					"style": {
-						"navigationBarTitleText": "实名认证",
-						"enablePullDownRefresh": false
-					}
-				},
+//				{
+//					"path": "login/login-real-name-auth",
+//					"style": {
+//						"navigationBarTitleText": "实名认证",
+//						"enablePullDownRefresh": false
+//					}
+//				},
 				{
 					"path": "login/retrieve-account",
 					"style": {
@@ -291,7 +291,7 @@
 				{
 					"path": "serviceObjectFaceAuth/index",
 					"style": {
-						"navigationBarTitleText": "上传照片",
+						"navigationBarTitleText": "上传",
 						"enablePullDownRefresh": false
 					}
 				},