Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/duanju/new_app into test

api/login/login.js

@@ -23,9 +23,10 @@ export const setSendMsg = (mobile,type) => {
 /**
  * 注册
  */
-export const registerCode = (params) => {
+export const register = (params) => {
 	return http.request({
 		url: '/Login/registerCode',
+		method: 'POST',
 		params: params
 	})
 }
@@ -48,6 +49,8 @@ export const bind = (data) => {
 	return http.request({
 		url: '/Login/registerCode',
 		method: 'POST',
-		params: data
+		data: data
 	})
-}
+}
+
+

api/user/user.js

@@ -31,3 +31,14 @@ export const updateUsers = (data) => {
 		data: data,
 	})
 }
+
+/**
+ * 修改手机号
+ */
+export const updatePhone = (data) => {
+	return http.request({
+		url: '/user/updatePhone',
+		method: 'POST',
+		params: data
+	})
+}

pages/index/index.vue

@@ -41,19 +41,19 @@
 			飙升
 		</view>
 	</view>
-	<contentlist :list='datas.list'></contentlist>
+	<contentlist :list='datas.list'></contentlist> 
 	<image v-if="datas.isExamine == 0" @click="goMsg('/me/VjgyqAzklr/VjgyqAzklr')" src="@/static/index/red-pack-new.gif"
 		style="width: 200rpx;height: 200rpx;position: fixed;right: 10rpx;bottom: 180rpx;" mode=""></image>
 
-	<u-modal :show="datas.version.show"  :confirm-text="datas.version.confirmText" :showCancelButton="datas.version.cancelText" @confirm='confirmUpdateVersion'
+	<up-modal :show="datas.version.show"  :confirm-text="datas.version.confirmText" :showCancelButton="datas.version.cancelText!=''" @confirm='confirmUpdateVersion'
 		:title="datas.version.title" :title-style="{ fontWeight: '700' }" confirm-color="rgb(255, 117, 129)" @cancel="datas.version.show = false">
 		<view class="" style="padding-top: 30rpx;text-align: left;">
 			<scroll-view scroll-y="true" style="max-height: 50vh;">
 				<rich-text style="color:#666" :nodes="datas.version.content"></rich-text>
 			</scroll-view>
 		</view>
-	</u-modal>
+	</up-modal>
-	<up-modal :show="datas.ruleShow" v-if="datas.isExamine == 0" confirm-text="知道了" title="规则说明" :title="datas.rule_title" :title-style="{fontWeight:'700'}" @confirm="ruleConfirm" confirm-color="rgb(255, 117, 129)">
+	<up-modal :show="datas.ruleShow" v-if="datas.isExamine == 0&&!datas.version.show" confirm-text="知道了" title="规则说明" :title="datas.rule_title" :title-style="{fontWeight:'700'}" @confirm="ruleConfirm" 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 style="text-align: justify;font-size: 18px;color: #666;" :nodes="datas.rule_content"></rich-text>

pages/login/bind.vue

@@ -20,6 +20,7 @@
 	import { reactive } from 'vue';
 	import { onLoad} from '@dcloudio/uni-app'
 	import { setSendMsg, bind} from '@/api/login/login.js';
+	import { updatePhone } from '@/api/user/user.js';
 	
 	let data = reactive({
 		mobile: '',
@@ -100,7 +101,7 @@
 		} else {
 			uni.showLoading({ title: '正在绑定中...' })
 			
-			let res = await bind({
+			let res = await updatePhone({
 					phone: mobile,
 					// wxId: openId,
 					// userId: userId,

pages/login/register.vue

@@ -48,7 +48,7 @@
 <script setup>
 	import { reactive } from 'vue';
 	import { onLoad} from '@dcloudio/uni-app'
-	import {setSendMsg,registerCode} from '@/api/login/login.js';
+	import {setSendMsg,register} from '@/api/login/login.js';
 	import {commonType} from '@/api/init.js';
 	import { linkTo } from '@/utils/app.js';
 	
@@ -235,7 +235,7 @@
 		// #endif
 		
 		
-		let res = await registerCode({
+		let res = await register({
 			password: password,
 			phone: mobile,
 			msg: code,