feat(specialArea): fix regiest

config/login.js

@@ -24,23 +24,23 @@ export const verification = params =>
 
 //忘记密码获取验证码
 export const forgetVerification = params =>
-  http.get('/retail-member/api/sms/forget-verification', { params })
+  http.get('/member/api/sms/forget-verification', { params })
 
 //保存地址
 export const saveAddress = data =>
-  http.post('/retail-member/api/retail-member-address/save', data)
+  http.post('/member/api/member-address/save', data)
 
 //更新密码
 export const updatePassword = data =>
-  http.put('/retail-member/api/retail-member/update-password', data)
+  http.put('/member/api/member/update-password', data)
 
 //忘记密码更新
 export const forgetPassword = data =>
-  http.put('/retail-member/api/retail-member/forget-password', data)
+  http.put('/member/api/member/forget-password', data)
 
 //获取地址详情
 export const getAddress = params =>
-  http.get('/retail-member/api/retail-member-address/detail/' + params)
+  http.get('/member/api/member-address/detail/' + params)
 
 //获取菜单权限
 export const menuList = data => http.get('/system/api/menu/list', data)
@@ -131,10 +131,10 @@ export const selfVerification = params =>
   http.get('/retail-member/api/sms/self-verification', { params })
 // 重置支付密码获取验证码
 export const resetPayPasswordVerification = params =>
-  http.get('/retail-member/api/sms/reset-verification', { params })
+  http.get('/member/api/sms/self-verification', { params })
 //更新支付密码
 export const forgetPayPassword = data =>
-  http.put('/retail-member/api/retail-member/forget-pay-password', data)
+  http.put('/member/api/member/forget-pay-password', data)
 
 // 站内信弹窗
 export const getIndexPopmail = params =>

config/mine.js

@@ -1,16 +1,25 @@
-
 const http = uni.$u.http
 
 //我的市场
-export const getMyMarket = (params) => http.get('/sale/api/order/index-myMarket', { params })
+export const getMyMarket = params =>
+  http.get('/sale/api/order/index-myMarket', { params })
 
 // 我的市场点亮
-export const getMyMarketColor = (params) => http.get('/system/manage/area/get-light-area', { params })
+export const getMyMarketColor = params =>
+  http.get('/system/manage/area/get-light-area', { params })
 // 礼品地址列表
-export const getMemberGift = (params) => http.get('/member/api/member-gift/member-gift-list', { params })
+export const getMemberGift = params =>
+  http.get('/member/api/member-gift/member-gift-list', { params })
 
 //全部荣誉墙
-export const getMemberHonorWallAll = (params) => http.get('/member/api/member/member-honor-wall-all', { params })
+export const getMemberHonorWallAll = params =>
+  http.get('/member/api/member/member-honor-wall-all', { params })
 
 //年度奖衔
-export const yearAwards = (params) => http.get('/member/api/member/year-awards-list', { params })
+export const yearAwards = params =>
+  http.get('/member/api/member/year-awards-list', { params })
+
+// 获取是否能区域选择的资格
+export const getRegionSelect = () => {
+  return http.get('/retail-member/api/retail-member/get-region')
+}

config/request.js

@@ -20,7 +20,7 @@ module.exports = vm => {
 
     //#ifdef DEV_SERVER
     console.log('DEV_SERVER')
-    config.baseURL = 'http://192.168.0.102:8080'
+    config.baseURL = 'http://localhost:8080'
     //#endif
 
     //#ifdef QA_SERVER

pages/address/index.vue

@@ -3,11 +3,7 @@
     <view class="contents">
       <u-form :model="addressForm" labelWidth="auto" ref="uForm">
         <view class="view-class">
-          <u-form-item
+          <u-form-item label="收货人" label-width="100px" prop="recName">
-            label="收货人"
-            label-width="100px"
-            prop="recName"
-          >
             <u-input
               :maxlength="40"
               v-model.trim="addressForm.recName"
@@ -18,11 +14,7 @@
           </u-form-item>
         </view>
         <view class="view-class">
-          <u-form-item
+          <u-form-item label="联系方式" label-width="100px" prop="recPhone">
-            label="联系方式"
-            label-width="100px"
-            prop="recPhone"
-          >
             <u-input
               v-if="pkCountry == 1"
               v-model.trim="addressForm.recPhone"
@@ -99,7 +91,9 @@
       @addressData="addressData"
     ></v-address>
     <u-button
-      :disabled="!addressForm.recName || !addressForm.recPhone || !addressForm.recAddress"
+      :disabled="
+        !addressForm.recName || !addressForm.recPhone || !addressForm.recAddress
+      "
       type="success"
       shape="circle"
       class="btn"
@@ -114,28 +108,28 @@
 </template>
 
 <script>
-import * as api from "@/config/login.js";
+import * as api from '@/config/login.js'
-import { setToken } from "@/config/auth.js";
+import { setToken } from '@/config/auth.js'
-import address from "@/components/address.vue";
+import address from '@/components/address.vue'
-import store from "@/store";
+import store from '@/store'
 export default {
   data() {
     return {
-      userInfo: "",
+      userInfo: '',
-      pkCountry:'',
+      pkCountry: '',
       check: false,
-      address: "",
+      address: '',
       defaultCode: [],
-      urls: "/member/api/maker-space/update-file",
+      urls: '/member/api/maker-space/update-file',
       addressForm: {
-        recName: "",
+        recName: '',
-        recPhone: "",
+        recPhone: '',
-        recProvince: "",
+        recProvince: '',
-        recCity: "",
+        recCity: '',
-        recCounty: "",
+        recCounty: '',
-        recAddress: "",
+        recAddress: '',
         isDefault: 0,
-        pkId: "",
+        pkId: '',
       },
       loading: false,
       rules: {
@@ -144,7 +138,7 @@ export default {
             // 必填项
             required: true,
             // 提示内容（会出现在u-form-item内的底部）
-            message: "姓名不能为空",
+            message: '姓名不能为空',
           },
         ],
         recAddress: [
@@ -152,7 +146,7 @@ export default {
             // 必填项
             required: true,
             // 提示内容（会出现在u-form-item内的底部）
-            message: "详细地址不能为空",
+            message: '详细地址不能为空',
           },
         ],
         recProvince: [
@@ -160,122 +154,125 @@ export default {
             // 必填项
             required: true,
             // 提示内容（会出现在u-form-item内的底部）
-            message: "地址不能为空",
+            message: '地址不能为空',
 
-            trigger: ["change"],
+            trigger: ['change'],
           },
         ],
         recPhone: [
           {
             required: true,
-            message: "请输入手机号",
+            message: '请输入手机号',
-            trigger: ["blur"],
+            trigger: ['blur'],
           },
           {
             validator: (rule, value, callback) => {
-              return this.$u.test.mobile(value);
+              return this.$u.test.mobile(value)
             },
-            message: "手机号格式不正确",
+            message: '手机号格式不正确',
-            trigger: ["blur"],
+            trigger: ['blur'],
           },
         ],
       },
-    };
+    }
   },
   onLoad(option) {
     if (option.pkId) {
-      this.getAddress(option.pkId);
+      this.getAddress(option.pkId)
       uni.setNavigationBarTitle({
-        title: "修改收货地址",
+        title: '修改收货地址',
-      });
+      })
     }
-    this.pkCountry = uni.getStorageSync("pkCountry");
+    this.pkCountry = uni.getStorageSync('pkCountry')
-    this.userInfo = uni.getStorageSync("User");
+    this.userInfo = uni.getStorageSync('User')
   },
   onReady() {
-    this.$refs.uForm.setRules(this.rules);
+    this.$refs.uForm.setRules(this.rules)
   },
   components: {
-    "v-address": address,
+    'v-address': address,
   },
   methods: {
     AddressData(name) {
-      this.address = name;
+      this.address = name
     },
     submit() {
-      this.$refs.uForm.validate().then((res) => {
+      this.$refs.uForm.validate().then(res => {
         this.loading = true
-        api.saveAddress(this.addressForm).then((res) => {
+        api
-          if (res.code == "200") {
+          .saveAddress(this.addressForm)
+          .then(res => {
+            if (res.code == '200') {
               const toast = uni.showToast({
                 title: res.msg,
-              icon: "none",
+                icon: 'none',
                 complete() {
                   setTimeout(() => {
                     this.loading = false
                     uni.navigateBack(1)
                     toast.hideToast()
-                }, 500);
+                  }, 500)
                 },
-            });
+              })
             } else {
               this.loading = false
             }
-        }).catch(() => {
+          })
+          .catch(() => {
             this.loading = false
           })
-      });
+      })
     },
     getDiqu() {
-      this.$refs.address.setShow();
+      this.$refs.address.setShow()
     },
     addressData(diqu, obj) {
-      this.address = diqu;
+      this.address = diqu
-      this.addressForm.recProvince = obj.province;
+      this.addressForm.recProvince = obj.province
-      this.addressForm.recCity = obj.city;
+      this.addressForm.recCity = obj.city
-      this.addressForm.recCounty = obj.county;
+      this.addressForm.recCounty = obj.county
-      this.$forceUpdate();
+      this.$forceUpdate()
       // this.getPostAge()
       // this.queryAdressPostage()
     },
     checkTap() {
       if (this.addressForm.isDefault == 0) {
-        this.addressForm.isDefault = 1;
+        this.addressForm.isDefault = 1
       } else {
-        this.addressForm.isDefault = 0;
+        this.addressForm.isDefault = 0
       }
     },
     getAddressData(e) {
-      console.error(e);
+      console.error(e)
     },
     getAddress(id) {
       api
         .getAddress(id)
-        .then((res) => {
+        .then(res => {
           if (res) {
             this.addressForm = {
               recName: res.data.recName,
               recPhone: res.data.recPhone,
               recProvince: res.data.recProvince,
               recCity: res.data.recCity,
-              recCounty: res.data.recCounty || "",
+              recCounty: res.data.recCounty || '',
               pkId: res.data.pkId,
               recAddress: res.data.recAddress,
               isDefault: res.data.isDefault,
-            };
+            }
             this.defaultCode = [
               res.data.recProvince,
               res.data.recCity,
-              res.data.recCounty || "",
+              res.data.recCounty || '',
-            ];
+            ]
           }
         })
-        .catch((error) => {
+        .catch(error => {
-          reject(error);
+          reject(error)
-        });
+        })
     },
   },
-};
+}
 </script>
 
 <style lang="scss" scoped>
@@ -297,7 +294,7 @@ export default {
   view {
     width: 36rpx;
     height: 36rpx;
-    border: 1rpx solid #dddddd;
+    border: 1rpx solid #000;
     border-radius: 50%;
     margin-top: 25rpx;
   }

pages/mine/balance/withdrawal.vue

@@ -1,125 +1,207 @@
 <template>
   <view class="content">
     <view class="theform">
-			<u--form labelPosition="left" :model="dataForm" :rules="rules" ref="uForm">
+      <u--form
-				<u-form-item label-width="200rpx" :label="'银行卡号'" prop="cardNumber" borderBottom ref="item1">
+        labelPosition="left"
-					<u--input v-if="bankData.cardNumber" v-model="bankData.cardNumber" disabled disabledColor="#F5F5F5;"
+        :model="dataForm"
-						border="none"></u--input>
+        :rules="rules"
-					<view v-else style="color:red" @click="goBindbank">
+        ref="uForm"
-						{{'请先绑定银行卡'}}
+      >
+        <u-form-item
+          label-width="200rpx"
+          :label="'银行卡号'"
+          prop="cardNumber"
+          borderBottom
+          ref="item1"
+        >
+          <u--input
+            v-if="bankData.cardNumber"
+            v-model="bankData.cardNumber"
+            disabled
+            disabledColor="#F5F5F5;"
+            border="none"
+          ></u--input>
+          <view v-else style="color: red" @click="goBindbank">
+            {{ '请先绑定银行卡' }}
           </view>
         </u-form-item>
-				<u-form-item label-width="200rpx" :label="`${'提现金额'}(${isLocaled()})`" prop="cashAmount"
+        <u-form-item
-					borderBottom ref="item1">
+          label-width="200rpx"
-					<u--input type='number' v-model="dataForm.cashAmount" :placeholder="'请输入'"
+          :label="`${'提现金额'}(${isLocaled()})`"
-						border="none"></u--input>
+          prop="cashAmount"
+          borderBottom
+          ref="item1"
+        >
+          <u--input
+            type="number"
+            v-model="dataForm.cashAmount"
+            :placeholder="'请输入'"
+            border="none"
+          ></u--input>
         </u-form-item>
-				<u-form-item label-width="200rpx" :label="'二级密码'" prop="payPwd" borderBottom ref="item1">
+        <u-form-item
+          label-width="200rpx"
+          :label="'二级密码'"
+          prop="payPwd"
+          borderBottom
+          ref="item1"
+        >
           <template v-if="!ifeye">
-						<u--input type='password' v-model="dataForm.payPwd" :placeholder="'请输入'"
+            <u--input
-							border="none"></u--input>
+              type="password"
-						<image @click="ifeye=!ifeye" slot="right" style="width: 38rpx;
+              v-model="dataForm.payPwd"
-								height: 25rpx;" src="../../../static/images/my_eye.png" mode=""></image>
+              :placeholder="'请输入'"
+              border="none"
+            ></u--input>
+            <image
+              @click="ifeye = !ifeye"
+              slot="right"
+              style="width: 38rpx; height: 25rpx"
+              src="../../../static/images/my_eye.png"
+              mode=""
+            ></image>
           </template>
           <template v-if="ifeye">
-						<u--input v-model="dataForm.payPwd" :placeholder="'请输入'" border="none"></u--input>
+            <u--input
-						<image @click="ifeye=!ifeye" slot="right" style="width: 38rpx;
+              v-model="dataForm.payPwd"
-								height: 30rpx;" src="../../../static/images/my_eye2.png" mode=""></image>
+              :placeholder="'请输入'"
+              border="none"
+            ></u--input>
+            <image
+              @click="ifeye = !ifeye"
+              slot="right"
+              style="width: 38rpx; height: 30rpx"
+              src="../../../static/images/my_eye2.png"
+              mode=""
+            ></image>
           </template>
         </u-form-item>
-				<u-form-item label-width="200rpx" :label="'备注'" prop="remarks" borderBottom ref="item1">
+        <u-form-item
+          label-width="200rpx"
+          :label="'备注'"
+          prop="remarks"
+          borderBottom
+          ref="item1"
+        >
           <u--input v-model="dataForm.remarks" border="none"></u--input>
         </u-form-item>
-				<u-form-item label-width="200rpx" :label="'提现账户'" prop="pkAccountName"
+        <u-form-item
-					@click="showAmount = true; " ref="item1">
+          label-width="200rpx"
-					<u--input v-model="dataForm.pkAccountName" disabled disabledColor="#ffffff"
+          :label="'提现账户'"
-						:placeholder="'请选择'" border="none"></u--input>
+          prop="pkAccountName"
+          @click="showAmount = true"
+          ref="item1"
+        >
+          <u--input
+            v-model="dataForm.pkAccountName"
+            disabled
+            disabledColor="#ffffff"
+            :placeholder="'请选择'"
+            border="none"
+          ></u--input>
           <u-icon slot="right" name="arrow-right"></u-icon>
         </u-form-item>
-				<u-picker @cancel='showAmount=false' :show="showAmount" ref="uPicker" :columns="pkBdAccountList"
+        <u-picker
-					@confirm="confirm" keyName='accountName'></u-picker>
+          @cancel="showAmount = false"
+          :show="showAmount"
+          ref="uPicker"
+          :columns="pkBdAccountList"
+          @confirm="confirm"
+          keyName="accountName"
+        ></u-picker>
       </u--form>
 
-
       <view class="contentbox">
         <view class="linebox">
-					<view>{{'可提现金额'}}(￥)：</view>
+          <view>{{ '可提现金额' }}(￥)：</view>
-					<view>{{widthDrwaData.amount||'0.00'}}</view>
+          <view>{{ widthDrwaData.amount || '0.00' }}</view>
         </view>
         <view class="linebox">
-					<view>{{'账户余额'}}(￥)：</view>
+          <view>{{ '账户余额' }}(￥)：</view>
-					<view>{{widthDrwaData.balance||'0.00'}}</view>
+          <view>{{ widthDrwaData.balance || '0.00' }}</view>
         </view>
         <view class="linebox">
-					<view>{{'提现手续费'}}：</view>
+          <view>{{ '提现手续费' }}：</view>
-					<view>{{widthDrwaData.srviceCharge||'0.00'}}</view>
+          <view>{{ widthDrwaData.srviceCharge || '0.00' }}</view>
         </view>
         <view class="linebox">
-					<view>{{'最低提现额度'}}(￥)：</view>
+          <view>{{ '最低提现额度' }}(￥)：</view>
-					<view>{{widthDrwaData.minAmount||'0.00'}}</view>
+          <view>{{ widthDrwaData.minAmount || '0.00' }}</view>
         </view>
       </view>
-
-
     </view>
     <view class="btnbox">
-			<u-button :disabled="canbind" class="subbtn" @click="submit">{{'提现'}}</u-button>
+      <u-button :disabled="canbind" class="subbtn" @click="submit">{{
+        '提现'
+      }}</u-button>
     </view>
     <u-toast ref="uToast"></u-toast>
   </view>
 </template>
 
 <script>
-	import * as bal from "@/config/balance.js"
+import * as bal from '@/config/balance.js'
-	import {
+import { isLocaled } from '@/util/numberToCurrency'
-		isLocaled
+export default {
-	} from '@/util/numberToCurrency'
-	export default {
   data() {
     return {
       showAmount: false,
       dataForm: {
-					cardNumber: "",
+        cardNumber: '',
-					cashAmount: "",
+        cashAmount: '',
-					payPwd: "",
+        payPwd: '',
-					remarks: "",
+        remarks: '',
-					pkAccountName: "",
+        pkAccountName: '',
-					pkAccount: "",
+        pkAccount: '',
-					pkBank: ""
+        pkBank: '',
       },
       pkBdAccountList: [],
       rules: {
-					cashAmount: [{
+        cashAmount: [
+          {
             type: 'string',
             required: true,
             message: '请输入',
-						trigger: ['blur', 'change']
+            trigger: ['blur', 'change'],
-					}],
+          },
-					payPwd: [{
+        ],
+        payPwd: [
+          {
             type: 'string',
             required: true,
             message: '请输入',
-						trigger: ['blur', 'change']
+            trigger: ['blur', 'change'],
-					}],
+          },
-					pkAccountName: [{
+        ],
+        pkAccountName: [
+          {
             required: true,
             message: '请选择',
-						trigger: ['change']
+            trigger: ['change'],
-					}],
+          },
+        ],
       },
       bankData: {},
-				widthDrwaData: {},
+      widthDrwaData: {
+        amount: 0,
+        balance: 0,
+        srviceCharge: 0,
+        minAmount: 0,
+      },
       ifeye: false,
-				canbind:false
+      canbind: false,
-
     }
   },
   watch: {
-			'dataForm.cashAmount': 'checkAccount'
+    'dataForm.cashAmount': {
+      handler(newVal) {
+        this.checkAccount(newVal || 0, this.dataForm.pkAccount)
+      },
+    },
   },
   onNavigationBarButtonTap() {
     uni.navigateTo({
-				url:'/pages/mine/balance/withdrawlDetail'
+      url: '/pages/mine/balance/withdrawlDetail',
     })
   },
   onLoad() {
@@ -128,30 +210,32 @@
   methods: {
     isLocaled,
     //绑定银行卡
-			goBindbank(){
+    goBindbank() {
       uni.navigateTo({
-					url:'/pages/mine/bindBank/bindBank'
+        url: '/pages/mine/bindBank/bindBank',
       })
     },
     getList() {
-				bal.getPkBdAccountList({
+      bal
-					accountProperty: 3
+        .getPkBdAccountList({
-				}).then(res => {
+          accountProperty: 3,
+        })
+        .then(res => {
           res.data.forEach(ele => {
             ele.name = ele.accountName
           })
           this.pkBdAccountList = [res.data]
 
-					if(this.pkBdAccountList.length>0){
+          if (this.pkBdAccountList.length > 0) {
             this.dataForm.pkAccountName = res.data[0].accountName
             this.dataForm.pkAccount = res.data[0].pkId
+            this.checkAccount(0, this.dataForm.pkAccount)
           }
-					
         })
-				bal.getDefaultBank().then((res) => {
+      bal.getDefaultBank().then(res => {
-					this.bankData = res.data;
+        this.bankData = res.data
-					this.dataForm.pkBank = res.data.pkId;
+        this.dataForm.pkBank = res.data.pkId
-				});
+      })
       //校验是否绑定银行卡
       bal.checkIsbindBank().then(res => {
         if (res.flag == 'Y') {
@@ -160,61 +244,61 @@
           this.canbind = true
         }
       })
-
     },
     submit() {
-				this.$refs.uForm.validate().then(res => {
+      this.$refs.uForm
+        .validate()
+        .then(res => {
           bal.addWithdraw(this.dataForm).then(res => {
             if (res.code == 200) {
               this.$refs.uToast.show({
                 message: res.msg,
-								type: 'success'
+                type: 'success',
               })
               setTimeout(() => {
                 uni.navigateBack()
-							}, 1000);
+              }, 1000)
             }
           })
-					
+        })
-
+        .catch(errors => {
-				}).catch(errors => {
           uni.$u.toast('校验失败')
         })
     },
     confirm(e) {
-
       this.dataForm.pkAccountName = e.value[0].accountName
       this.dataForm.pkAccount = e.value[0].pkId
       this.showAmount = false
-				this.checkAccount()
+      this.checkAccount(this.dataForm.cashAmount, this.dataForm.pkAccount)
-
     },
-			checkAccount() {
+    checkAccount(cashAmount, pkAccount) {
-				if (!this.dataForm.cashAmount) {
+      if (!cashAmount && cashAmount !== 0) {
         uni.$u.toast('请先输入金额')
         return
-				} else if (!this.dataForm.pkAccount) {
+      } else if (!pkAccount) {
         uni.$u.toast('请先选择账户')
         return
       }
-				bal.getWidthdrawShow({
+      bal
-					pkAccount: this.dataForm.pkAccount,
+        .getWidthdrawShow({
-					cashAmount: this.dataForm.cashAmount,
+          pkAccount,
-				}).then(res => {
+          cashAmount,
+        })
+        .then(res => {
           this.widthDrwaData = res.data
         })
-			}
+    },
-		}
+  },
-	}
+}
 </script>
 
 <style lang="scss" scoped>
-	.content {
+.content {
-		background: #F2F2F2;
+  background: #f2f2f2;
 
   .theform {
     margin-top: 6rpx;
-			background: #FFFFFF;
+    background: #ffffff;
     padding: 20rpx 23rpx 48rpx 23rpx;
 
     .contentbox {
@@ -234,7 +318,6 @@
         margin-top: 8rpx;
       }
     }
-
   }
 
   .btnbox {
@@ -242,15 +325,13 @@
     padding: 0 20rpx;
 
     .subbtn {
-				background: #005BAC;
+      background: #005bac;
       border-radius: 46rpx;
       font-size: 30rpx;
       font-family: Source Han Sans CN;
       font-weight: 400;
-				color: #FFFFFF;
+      color: #ffffff;
     }
   }
-
+}
-
-	}
 </style>

pages/mine/index.vue

@@ -176,6 +176,31 @@
         </view>
       </view>
 
+      <!-- 我的区域 -->
+      <view class="my_order" v-if="regionInfoVisible">
+        <view class="my_title">
+          <text class="thetitle">{{ '我的区域' }}</text>
+        </view>
+        <view class="region-info-box">
+          <view class="region-info-item">
+            <text class="region-info-value">{{
+              regionInfo.province || '-'
+            }}</text>
+            <text class="region-info-label">{{ '省' }}</text>
+          </view>
+          <view class="region-info-item">
+            <text class="region-info-value">{{ regionInfo.city || '-' }}</text>
+            <text class="region-info-label">{{ '市' }}</text>
+          </view>
+          <view class="region-info-item">
+            <text class="region-info-value">{{
+              regionInfo.county || '-'
+            }}</text>
+            <text class="region-info-label">{{ '区' }}</text>
+          </view>
+        </view>
+      </view>
+
       <!-- 市场动态 -->
       <view class="my_order" v-if="marketWrapperVisible">
         <view class="my_title">
@@ -295,6 +320,7 @@ import clTabbar from '@/components/cl-tabbar.vue'
 import * as min from '@/config/balance.js'
 import * as api from '@/config/login.js'
 import { MEMBER_SIGN } from '@/util/common.js'
+import { getRegionSelect } from '@/config/mine.js'
 // import talentList from "@/components/talentList.vue";
 export default {
   components: {
@@ -372,13 +398,13 @@ export default {
           menuKey: 'wallet',
           ifshow: false,
         },
-        {
+        // {
-          url: '/pages/pickupArea/pickupArea',
+        //   url: '/pages/pickupArea/pickupArea',
-          name: '提货专区',
+        //   name: '提货专区',
-          imgurl: '../../static/images/my_icon3.png',
+        //   imgurl: '../../static/images/my_icon3.png',
-          menuKey: 'pickGoods',
+        //   menuKey: 'pickGoods',
-          ifshow: false,
+        //   ifshow: false,
-        },
+        // },
         {
           url: '/pages/ticket/index',
           name: '自助购票',
@@ -466,24 +492,26 @@ export default {
         //   menuKey: "",
         //   ifshow: false,
         // },
-        {
+        // {
-          url: '/pages/mine/addNewPv/index',
+        //   url: '/pages/mine/addNewPv/index',
-          name: '新增业绩',
+        //   name: '新增业绩',
-          imgurl: '../../static/images/mark9.png',
+        //   imgurl: '../../static/images/mark9.png',
-          menuKey: 'iNewAchievement',
+        //   menuKey: 'iNewAchievement',
-          ifshow: false,
+        //   ifshow: false,
-        },
+        // },
       ],
       drShow: false,
       actMenu: false,
       iHonorAward: false,
       ifSpecial: false,
       awardsList: '',
+      regionInfo: {},
     }
   },
   onShow() {
     this.getInfo()
     this.orderNum()
+    this.getRegionSelect()
     // this.getUserAwardss()
   },
 
@@ -530,9 +558,19 @@ export default {
     marketWrapperVisible() {
       return this.userInfo.memberSign == MEMBER_SIGN.V5_LEVEL
     },
+    regionInfoVisible() {
+      return this.regionInfo?.regionStatus === 0
+    },
   },
 
   methods: {
+    getRegionSelect() {
+      getRegionSelect().then(res => {
+        if (res.code == 200) {
+          this.regionInfo = res.data
+        }
+      })
+    },
     goYear() {
       uni.navigateTo({
         url: '/pages/mine/yearGift/index',
@@ -1347,4 +1385,30 @@ export default {
   font-size: 24rpx;
   padding: 0 4rpx;
 }
+
+.region-info-box {
+  display: flex;
+  justify-content: space-around;
+  padding: 30rpx 0;
+  text-align: center;
+}
+
+.region-info-item {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
+.region-info-label {
+  font-size: 24rpx;
+  color: #999;
+  margin-top: 10rpx;
+}
+
+.region-info-value {
+  font-size: 28rpx;
+  color: #333;
+  font-weight: 600;
+}
 </style>

pages/regiest/index.vue

@@ -33,7 +33,7 @@
         </u-form-item>
         <u-form-item label="会员姓名" required borderBottom prop="memberName">
           <u-input
-            :disabled="isRegiest"
+            :disabled="!isRegiest"
             :maxlength="40"
             v-model="form.memberName"
             border="none"
@@ -48,7 +48,7 @@
         >
           <u-input
             v-model="form.phone"
-            :disabled="isRegiest"
+            :disabled="!isRegiest"
             maxlength="11"
             type="number"
             border="none"

pages/userSecure/index.vue

@@ -3,54 +3,42 @@
     <!-- 账号安全 -->
     <view class="contentLink">
       <u-cell-group>
-        <u-cell isLink
+        <u-cell isLink url="/pages/password/loginPassword" class="border-style">
-                url="/pages/password/loginPassword"
+          <view slot="title" class="u-slot-title">
-                class="border-style">
+            <text class="u-cell-text">{{ '修改登录密码' }}</text>
-          <view slot="title"
-                class="u-slot-title">
-            <text class="u-cell-text">{{'修改登录密码'}}</text>
           </view>
         </u-cell>
-        <u-cell isLink
+        <u-cell isLink url="/pages/password/payPassword" class="border-style">
-                url="/pages/password/payPassword"
+          <view slot="title" class="u-slot-title">
-                class="border-style">
+            <text class="u-cell-text">{{ '修改支付密码' }}</text>
-          <view slot="title"
-                class="u-slot-title">
-            <text class="u-cell-text">{{'修改支付密码'}}</text>
           </view>
         </u-cell>
-        <u-cell isLink
+        <u-cell isLink @click="goUrl" class="border-style">
-                @click="goUrl"
+          <view slot="title" class="u-slot-title">
-                class="border-style">
-          <view slot="title"
-                class="u-slot-title">
             <text class="u-cell-text">重置支付密码</text>
           </view>
         </u-cell>
         <u-cell v-if="showFix == 1">
-          <view slot="title"
+          <view slot="title" class="u-slot-title">
-                class="u-slot-title">
+            <text class="u-cell-text">{{ '联系方式' }}</text>
-            <text class="u-cell-text">{{'联系方式'}}</text>
           </view>
-          <view slot="value"
+          <view slot="value" class="u-slot-title">
-                class="u-slot-title">
+            <text class="u-cell-text">{{ tel }}</text>
-            <text class="u-cell-text">{{tel}}</text>
           </view>
         </u-cell>
-        <u-cell v-if="showFix == 0"
+        <u-cell
+          v-if="showFix == 0"
           isLink
-                url="/pages/selfService/updateDomicile/addDomicile">
+          url="/pages/selfService/updateDomicile/addDomicile"
-          <view slot="title"
+        >
-                class="u-slot-title">
+          <view slot="title" class="u-slot-title">
-            <text class="u-cell-text">{{'联系方式'}}</text>
+            <text class="u-cell-text">{{ '联系方式' }}</text>
           </view>
-          <view slot="value"
+          <view slot="value" class="u-slot-title">
-                class="u-slot-title">
+            <text class="u-cell-text">{{ tel }}</text>
-            <text class="u-cell-text">{{tel}}</text>
           </view>
         </u-cell>
       </u-cell-group>
-
     </view>
   </view>
 </template>
@@ -59,7 +47,6 @@ import clTabbar from '@/components/cl-tabbar.vue'
 import * as min from '@/config/balance.js'
 import * as ban from '@/config/balance.js'
 import { checkIfShow } from '@/config/selfService.js'
-import { getData } from '@/config/login'
 
 export default {
   components: {
@@ -77,17 +64,13 @@ export default {
   onLoad() {
     this.userInfo = uni.getStorageSync('User')
     this.checkIfShow()
-    this.getMemberInfo()
+    // this.getMemberInfo()
+    this.tel = this.userInfo.phone
   },
   onShow() {},
   methods: {
-    getMemberInfo() {
-      getData().then((res) => {
-        this.tel = res.data.phone
-      })
-    },
     checkIfShow() {
-      checkIfShow().then((res) => {
+      checkIfShow().then(res => {
         this.showFix = res.data.existDomicile
       })
     },
@@ -101,7 +84,7 @@ export default {
         .checkPwd({
           pwd: this.password,
         })
-        .then((res) => {
+        .then(res => {
           if (res.code == 200) {
             this.password = ''
             this.pswShow = false