style:新老系统切换

common/js/api.js

@@ -4,7 +4,6 @@ import request from '../js/request.js';
 export default {
 
 
-
     //我的权益卡列表
     orderFinish(orderId) {
         return request({
@@ -131,7 +130,14 @@ export default {
             data: data
         })
     },
-
+// get请求 通过电话及名称获取老系统会员信息
+    getOldMember(data) {
+        return request({
+            url: '/member/wechat/getOldMember',
+            method: 'GET',
+            data: data
+        })
+    },
 
     // get请求 通过会员编号获取老系统充值记录
     getOrderRechargeOldList(data) {
@@ -152,11 +158,16 @@ export default {
     },
 
     // post请求 通过会员编号提交迁移申请，默认迁移到当前迁移账户上
-    submitOldData(data) {
+    submitOldData(memberNo) {
         return request({
             url: '/member/wechat/submitOldData',
             method: 'POST',
-            data: data
+            header:{
+                'content-type': 'application/x-www-form-urlencoded'
+            },
+            data:memberNo
+
+
         })
     },
     // get请求，获取订单列表
@@ -472,6 +483,7 @@ export default {
             data: data
         })
     },
+
     // post请求，验证手机号码是否被注册
     phoneIsExist(data) {
         return request({
@@ -545,7 +557,6 @@ export default {
     },
 
     // post请求，获取积分列表信息
-
     getIntegralRecordList(data) {
         return request({
             url: '/member/wechat/getIntegralRecordVo',
@@ -553,6 +564,7 @@ export default {
             data: data
         })
     },
+
     // post请求，用户绑定门店
     userBindStore(data) {
         return request({
@@ -590,7 +602,6 @@ export default {
     },
 
     // get请求 获取banner图列表
-
     getSlideshowList(data) {
         return request({
             url: '/system/openapi/getSlideshowList',
@@ -599,7 +610,6 @@ export default {
         })
     },
     // get请求 获取门店所有服务列表
-
     storeAllServiceList(data) {
         return request({
             url: '/business/wechat/sp/all/' + data.storeId,
@@ -609,7 +619,6 @@ export default {
     },
 
     // get请求 获取门店列表
-
     storeList(data) {
         return request({
             url: '/store/uniapp/store-list/distance',
@@ -619,8 +628,6 @@ export default {
     },
 
     // get请求 获取门店工作人员列表 关联岗位、工作时段、服务项目
-
-
     workPersonList(data) {
         return request({
             url: '/store/uniapp/work-person-ist/' + data.storeId,
@@ -639,7 +646,6 @@ export default {
     },
 
     // get请求 根据门店查询排班日期
-
     selectDate(data) {
         return request({
             url: '/business/wechat/scheduling/selectDate',
@@ -718,7 +724,6 @@ export default {
         })
 
     },
-
     getImage(id) {
         return request({
             url: '/resource/oss/listByIds/' + id,
@@ -726,8 +731,6 @@ export default {
         })
 
     },
-
-
     /**
      * 微信静默登录
      */
@@ -749,7 +752,6 @@ export default {
             data: data
         })
     },
-
     // 推广统计
     spreadCount() {
         return request({
@@ -766,5 +768,4 @@ export default {
         })
     },
 
-
 }

common/js/env.js

@@ -1,6 +1,7 @@
 "use strict";
 
-let baseUrl = `https://jje.admin.xinyuekj.com.cn`
+// let baseUrl = `https://jje.admin.xinyuekj.com.cn`
+let baseUrl = `https://jje.admin.xinyuekj.com.cn/test-api/`
 // let baseUrl = `http://127.0.0.1:9000`
 // let baseUrl = `http://192.168.1.7:8080`
 // let baseUrl = `http://192.168.1.2:8080`

common/js/request.js

@@ -5,10 +5,14 @@ function service(options = {}) {
 	// 判断本地是否存在token，如果存在则带上请求头
 	let access_token = uni.getStorageSync('accessToken')
 	let refresh_token = uni.getStorageSync('refresh_token')
-	options.header = {
-		'Authorization': 'Bearer '+ access_token,
-		'content-type': 'application/json'
-	};
+	if(options.header&&options.header['content-type']){
+		options.header['Authorization'] ='Bearer '+ access_token
+	}else {
+		options.header = {
+			'Authorization': 'Bearer '+ access_token,
+			'content-type':'application/json'
+		};
+	}
 
 	// resolved是返回成功数据，rejected返回错误数据
 	return new Promise((resolved, rejected) => {
@@ -25,7 +29,6 @@ function service(options = {}) {
 						duration: 3000,
 						title: '登录过期，即将跳转登录页'
 					});
-
 					setTimeout(()=>{
 						uni.navigateTo({
 							url:'/pages/login/login'

main.js

@@ -9,7 +9,8 @@ import api from './common/js/api'
 console.log(`process`, process.envenv)
 
 import uView from "uview-ui";
-const baseUrl = 'https://jje.admin.xinyuekj.com.cn';
+// const baseUrl = 'https://jje.admin.xinyuekj.com.cn';
+const baseUrl = 'https://jje.admin.xinyuekj.com.cn/test-api/';
 // const baseUrl = 'http://192.168.1.150:8080';
 // const baseUrl = 'http://192.168.1.2:8080';
 Vue.use(uView);

myPages/systemSwitch/index.vue

@@ -1,800 +1,834 @@
 <template>
-    <view class="container">
-        <view class="step-bar">
-            <view v-for="(step, index) in steps" :key="index">
-                <view >
-                    <view class="h-num">
-                        <text>{{ index + 1 }}</text>
-                    </view>
-                    <view v-if="index !== steps.length - 1" class="separator"></view>
-                </view>
-                <view class="">{{ step }}</view>
-            </view>
+  <view class="container">
+    <view class="step-bar">
+      <view >
+        <view class="h-num">
+          <view class="head-ball" :style="currentStep == 0 ? 'background-color: #fbe362;':'background-color: #91d224;color:#FFFFFF' " >
+            <text>1</text>
+          </view>
         </view>
-        <view class="form">
-            <view v-if="currentStep === 0" class="h-content-wrap">
-                <u--form labelPosition="top" :model="userInfo" :rules="rules" ref="form1">
-                    <u-form-item labelWidth="auto" labelAlign="right" label="老系统手机号" prop="phone">
-                        <u--input v-model="userInfo.phone" disabledColor="#ffffff" placeholder="填写老系统电话" border="bottom"
-                            maxlength="11"></u--input>
-                    </u-form-item>
-                    <u-form-item label="老系统会员姓名" prop="memberName" labelPosition="top" labelWidth="auto" labelAlign="right">
-                        <u--input v-model="userInfo.memberName" disabledColor="#ffffff" placeholder="填写姓名" border="bottom"
-                            maxlength="16"></u--input>
-                    </u-form-item>
-
-                    <u-form-item label="当前手机号" prop="phonenumber" labelWidth="auto" labelAlign="right">
-                        <u--input v-model="userInfo.phonenumber" disabledColor="#ffffff" placeholder="填写当前手机号"
-                            border="bottom" maxlength="11"></u--input>
-                    </u-form-item>
-                    <u-form-item labelWidth="auto" labelAlign="right" label="验证码" prop="smsCode" width="120">
-                        <u--input v-model="userInfo.smsCode" disabledColor="#ffffff" placeholder="请输入验证码" border="bottom"
-                            maxlength="6"></u--input>
-                        <template #right>
-                            <view class="identifying-code">
-                                <u-code ref="uCode2" @change="codeChange2" keep-running start-text="获取验证码"></u-code>
-                                <text @tap="getCode2" :text="tips2" class="u-page__code-text">{{ tips2 }}</text>
-                            </view>
-                        </template>
-
-                    </u-form-item>
-                </u--form>
+        <view class="">账号查询</view>
+      </view>
+      <view>
+        <u-icon name="more-dot-fill" color="#cccccc" size="28"></u-icon>
+      </view>
+      <view >
+        <view class="h-num">
+          <view class="head-ball" :style="currentStep == 1 ? 'background-color: #fbe362;':(currentStep == 0? 'background-color: #FFFFFF' :'background-color: #91d224;color:#FFFFFF' )  " >
+            <text>2</text>
+          </view>
+        </view>
+        <view class="">信息确认</view>
+      </view>
+      <view>
+        <u-icon name="more-dot-fill" color="#cccccc" size="28"></u-icon>
+      </view>
+      <view >
+        <view class="h-num">
+          <view class="head-ball" :style="currentStep == 2 ? 'background-color: #fbe362;':'background-color: #FFFFFF' " >
+            <text>3</text>
+          </view>
+        </view>
+        <view class="">账号迁移</view>
+      </view>
+    </view>
+    <view class="form">
+      <view v-if="currentStep === 0" class="h-content-wrap">
+        <u--form labelPosition="top" :model="userInfo" :rules="rules" ref="form1">
+          <u-form-item labelWidth="auto" labelAlign="right" label="老系统手机号" prop="phone">
+            <u--input v-model="userInfo.phone" disabledColor="#ffffff" placeholder="填写老系统电话" border="bottom"
+                      maxlength="11"></u--input>
+          </u-form-item>
+          <u-form-item label="老系统会员姓名" prop="memberName" labelPosition="top" labelWidth="auto" labelAlign="right">
+            <u--input v-model="userInfo.memberName" disabledColor="#ffffff" placeholder="填写姓名" border="bottom"
+                      maxlength="16"></u--input>
+          </u-form-item>
+          <u-form-item label="当前手机号" prop="phonenumber" labelWidth="auto" labelAlign="right">
+            <u--input v-model="userInfo.phonenumber" disabledColor="#ffffff" placeholder="填写当前手机号"
+                      border="bottom" maxlength="11"></u--input>
+          </u-form-item>
+          <u-form-item labelWidth="auto" labelAlign="right" label="验证码" prop="smsCode" width="120">
+            <u--input v-model="userInfo.smsCode" disabledColor="#ffffff" placeholder="请输入验证码" border="bottom"
+                      maxlength="6"></u--input>
+            <template #right>
+              <view class="identifying-code">
+                <u-code ref="uCode2" @change="codeChange2" keep-running start-text="获取验证码"></u-code>
+                <text @tap="getCode2" :text="tips2" class="u-page__code-text">{{ tips2 }}</text>
+              </view>
+            </template>
+          </u-form-item>
+        </u--form>
+      </view>
+      <view v-if="currentStep === 1">
+        <view class="h-content">
+          <view class="h-basic-info">
+            <view class="h-value">
+              <view class="h-name">会员编号</view>
+              <view class="h-text">{{ userMemberInfo.memberNo }}</view>
+            </view>
+            <view class="h-value">
+              <view class="h-name">会员卡号</view>
+              <view class="h-text">{{ userMemberInfo.memberCard }}</view>
+            </view>
+            <view class="h-value">
+              <view class="h-name">会员姓名</view>
+              <view class="h-text">{{ userMemberInfo.memberName }}</view>
+            </view>
+            <view class="h-value">
+              <view class="h-name">手机号码</view>
+              <view class="h-text">{{ userMemberInfo.phone }}</view>
+            </view>
+
+            <view class="h-value">
+              <view class="h-name">积分</view>
+              <view class="h-text">{{ userMemberInfo.integral }}</view>
+            </view>
+            <view class="h-value">
+              <view class="h-name">账户余额</view>
+              <view class="h-text">￥{{ userMemberInfo.nowBalance }}</view>
             </view>
-            <view v-if="currentStep === 1">
+          </view>
+          <view class="h-record">
+            <!-- 导航-->
+            <view class="service-order-tab-bar">
+              <view class="service-order-tab-item" :class="{ active: currentServiceTab === 'orderTab1' }"
+                    @click="changeServiceTab('orderTab1')">
+                <text :class="{ underline: currentServiceTab === 'orderTab1' }">充值记录</text>
+              </view>
+              <view class="service-order-tab-item" :class="{ active: currentServiceTab === 'orderTab2' }"
+                    @click="changeServiceTab('orderTab2')">
+                <text :class="{ underline: currentServiceTab === 'orderTab2' }">消费记录</text>
+              </view>
+            </view>
+            <view class="custom-line"></view>
+            <!-- order -->
+            <view v-if="currentServiceTab == 'orderTab1' " class="store-order-wrap">
+              <view v-for="(item, index) in memberInfoRecords" class="store-order">
                 <view class="h-content">
-                    <view class="h-basic-info">
-                        <view class="h-value">
-                            <view class="h-name">会员编号</view>
-                            <view class="h-text">{{ userMemberInfo.memberNo }}</view>
-                        </view>
-                        <view class="h-value">
-                            <view class="h-name">会员卡号</view>
-                            <view class="h-text">{{ userMemberInfo.memberCard }}</view>
-                        </view>
-                        <view class="h-value">
-                            <view class="h-name">会员姓名</view>
-                            <view class="h-text">{{ userMemberInfo.memberName }}</view>
-                        </view>
-                        <view class="h-value">
-                            <view class="h-name">手机号码</view>
-                            <view class="h-text">{{ userMemberInfo.phone }}</view>
-                        </view>
-
-                        <view class="h-value">
-                            <view class="h-name">积分</view>
-                            <view class="h-text">{{ userMemberInfo.integral }}</view>
-                        </view>
-                        <view class="h-value">
-                            <view class="h-name">账户余额</view>
-                            <view class="h-text">￥{{ userMemberInfo.nowBalance }}</view>
-                        </view>
-                    </view>
-                    <view class="h-record">
-                        <!-- 导航-->
-                        <view class="service-order-tab-bar">
-                            <view class="service-order-tab-item" :class="{ active: currentServiceTab === 'orderTab1' }"
-                                @click="changeServiceTab('orderTab1')">
-                                <text :class="{ underline: currentServiceTab === 'orderTab1' }">充值记录</text>
-                            </view>
-                            <view class="service-order-tab-item" :class="{ active: currentServiceTab === 'orderTab2' }"
-                                @click="changeServiceTab('orderTab2')">
-                                <text :class="{ underline: currentServiceTab === 'orderTab2' }">消费记录</text>
-                            </view>
-                        </view>
-                        <view class="custom-line"></view>
-                        <!-- order -->
-                        <view v-if="currentServiceTab == 'orderTab1'" class="store-order-wrap">
-                            <view v-for="(item, index) in memberInfoRecords" class="store-order">
-                                <view class="h-content">
-                                    <view class="h-row">
-                                        <view class="h-value">
-                                            <text>储值记录</text>
-                                        </view>
-                                        <view class="h-value">
-                                            <text>+ ¥{{ item.rechargeAmount }}</text>
-                                        </view>
-                                    </view>
-                                    <view class="h-row">
-                                        <view class="h-value">
-                                            <text class="h-text">{{ item.rechargeTime }}</text>
-                                        </view>
-                                        <view class="h-value h-name">
-                                            <text class="h-text">账户余额：¥{{ item.nowBalance }}</text>
-                                        </view>
-                                    </view>
-                                </view>
-                                <view class="custom-line"></view>
-                            </view>
-                        </view>
-                        <view v-if="currentServiceTab == 'orderTab2'" class="store-order-wrap">
-                            <view v-for="(item, index) in memberInfoRecords" class="store-order">
-                                <view class="h-content">
-                                    <view class="h-row">
-                                        <view class="h-value">
-                                            <text>消费记录</text>
-                                        </view>
-                                        <view class="h-value">
-                                            <text>- ¥{{ item.consumeAmount }}</text>
-                                        </view>
-                                    </view>
-                                    <view class="h-row">
-                                        <view class="h-value">
-                                            <text class="h-text">{{ item.consumeTime }}</text>
-                                        </view>
-                                        <view class="h-value h-name">
-                                            <text class="h-text">账户余额：¥{{ item.nowBalance }}</text>
-                                        </view>
-                                    </view>
-                                </view>
-                                <view class="custom-line"></view>
-                            </view>
-                        </view>
+                  <view class="h-row">
+                    <view class="h-value">
+                      <text>储值记录</text>
                     </view>
-                </view>
-            </view>
-            <view v-if="currentStep === 2" class="">
-                <view class="letter-commitment">
-                    <view class="h-title">
-                        <text>个人信息真实承诺书</text>
+                    <view class="h-value">
+                      <text>+ ¥{{ item.rechargeAmount }}</text>
                     </view>
-                    <view class="">
-                        <text>会员姓名：{{ userInfo.memberName }}</text>
+                  </view>
+                  <view class="h-row">
+                    <view class="h-value">
+                      <text class="h-text">{{ item.rechargeTime }}</text>
                     </view>
-                    <view class="">
-                        <text>老系统手机号： {{ userInfo.phone }}</text>
+                    <view class="h-value h-name">
+                      <text class="h-text">账户余额：¥{{ item.nowBalance }}</text>
                     </view>
-                    <view class="">
-                        <text>当前手机号： {{ userInfo.phonenumber }}</text>
+                  </view>
+                </view>
+                <view class="custom-line"></view>
+              </view>
+            </view>
+            <view v-if="currentServiceTab == 'orderTab2'" class="store-order-wrap">
+              <view v-for="(item, index) in memberInfoRecords" class="store-order">
+                <view class="h-content">
+                  <view class="h-row">
+                    <view class="h-value">
+                      <text>消费记录</text>
                     </view>
-                    <view class="">
-                        <text>为系统迁移： 本人郑重承诺</text>
+                    <view class="h-value">
+                      <text>- ¥{{ item.consumeAmount }}</text>
                     </view>
-                    <view class="h-content">
-                        <view class="" v-html="termOfService.aboutContent"></view>
+                  </view>
+                  <view class="h-row">
+                    <view class="h-value">
+                      <text class="h-text">{{ item.consumeTime }}</text>
                     </view>
-
+<!--                    <view class="h-value h-name">-->
+<!--                      <text class="h-text">账户余额：¥{{ item.nowBalance }}</text>-->
+<!--                    </view>-->
+                  </view>
                 </view>
-
+                <view class="custom-line"></view>
+              </view>
             </view>
+          </view>
         </view>
-
-        <view v-if="currentStep === 3" class="">
-            <view class="h-content-step-end">
-                <view class="h-success">
-                    <u-icon name="edit-pen-fill" color="#333" size="30"></u-icon>
-                </view>
-                <view class="h-name">
-                    <text>账户迁移成功</text>！
-                </view>
-                <view @click="nextStep(3)" class="h-btn">
-                    <text>确认</text>
-                </view>
-            </view>
+      </view>
+      <!--      <view v-if="currentStep === 2" class="">-->
+      <!--        <view class="letter-commitment">-->
+      <!--          <view class="h-title">-->
+      <!--            <text>个人信息真实承诺书</text>-->
+      <!--          </view>-->
+      <!--          <view class="">-->
+      <!--            <text>会员姓名：{{ userInfo.memberName }}</text>-->
+      <!--          </view>-->
+      <!--          <view class="">-->
+      <!--            <text>老系统手机号： {{ userInfo.phone }}</text>-->
+      <!--          </view>-->
+      <!--          <view class="">-->
+      <!--            <text>当前手机号： {{ userInfo.phonenumber }}</text>-->
+      <!--          </view>-->
+      <!--          <view class="">-->
+      <!--            <text>为系统迁移： 本人郑重承诺</text>-->
+      <!--          </view>-->
+      <!--          <view class="h-content">-->
+      <!--            <view class="" v-html="termOfService.aboutContent"></view>-->
+      <!--          </view>-->
+
+      <!--        </view>-->
+
+      <!--      </view>-->
+    </view>
+    <view v-if="currentStep === 2" class="">
+      <view class="h-content-step-end">
+        <view class="h-success">
+          <u-icon name="checkmark" color="#5dac17" size="70"></u-icon>
         </view>
-
-        <view v-if="currentStep == 0" class="button-group">
-            <!-- <button @click="prevStep" :disabled="currentStep === 0">上一步</button> -->
-            <button class="h-btn" @click="nextStep(0)" :disabled="currentStep === steps.length - 1">开始查询</button>
+        <view class="h-name">
+          <text>账户迁移成功</text>
+          ！
         </view>
-
-        <view v-if="currentStep == 1" class="button-group">
-            <button @click="prevStep" :disabled="currentStep === 0">上一步</button>
-            <view class="h-btn" @click="nextStep(1)" :disabled="currentStep === steps.length - 1">
-                <text>下一步</text>
-            </view>
+        <view @click="nextStep(3)" class="h-btn">
+          <text>确认</text>
         </view>
+      </view>
+    </view>
+    <view v-if="currentStep == 0" class="button-group">
+      <!-- <button @click="prevStep" :disabled="currentStep === 0">上一步</button> -->
+      <button class="h-btn" @click="nextStep(0)" :disabled="currentStep === steps.length - 1">开始查询</button>
+    </view>
 
-        <view v-if="currentStep == 2" class="button-group">
-            <button @click="prevStep" :disabled="currentStep === 0">上一步</button>
-            <view class="h-btn" @click="nextStep(2)" :disabled="currentStep === steps.length - 1">
-                <text>确认并迁移</text>
-            </view>
-        </view>
+
+    <view v-if="currentStep == 1" class="button-group">
+      <button @click="prevStep" :disabled="currentStep === 0">上一步</button>
+      <view class="h-btn" @click="nextStep(2)" :disabled="currentStep === steps.length - 1">
+        <text>确认并迁移</text>
+      </view>
     </view>
+  </view>
 </template>
 
 <script>
 import signature from '../components/sign/sign';
+
 export default {
-    components: {
-        signature
-    },
-    data() {
-        return {
-            showCanvas: false,
-            currentStep: 0,
-            steps: ['账户查询', '信息确认', '用户承诺', '账户迁移'], // 步骤条的文字内容
-            step1Value: '',
-            step2Value: '',
-            step3Value: '',
-            userInfo: {
-                auth: true,
-                phone: '',
-                memberName: '',
-                phonenumber: '',
-                smsCode: '',
-                memberNo: null,
-                type: 7,
-                requstForm: true
+  components: {
+    signature
+  },
+  data() {
+    return {
+      showCanvas: false,
+      currentStep: 0,
+      steps: ['账户查询', '信息确认', '账户迁移'], // 步骤条的文字内容
+      step1Value: '',
+      step2Value: '',
+      step3Value: '',
+      userInfo: {
+        auth: true,
+        phone: '18231041846',
+        memberName: '赵梓熠-测试',
+        phonenumber: '18231041846',
+        smsCode: '',
+        memberNo: "18902",
+        type: 7,
+        requstForm: true
+      },
+      // 服务条款对象信息
+      termOfService: {
+        aboutContent: "<p>会员协议会员协议会员协议会员协议会员协议会员协议</p>",
+        aboutType: "1",
+        createBy: "admin",
+        createTime: "2023-07-30 08:53:17",
+        id: "1685574269874098178",
+        status: "0",
+        updateBy: "admin",
+        updateTime: "2023-07-30 21:04:51"
+      },
+      userMemberInfo: {
+        memberNo: "string",
+        pingYinCode: "string",
+        memberName: "string",
+        integral: 0,
+        sex: 0,
+        birthday: "string",
+        phone: "string",
+        memberPassword: "string",
+        height: "string",
+        weight: "string",
+        memberCard: "string",
+        address: "string",
+        nowBalance: 0,
+        totalConsumeAmount: 0,
+        debt: 0,
+        remarks: "string",
+        joinTime: "string",
+        memberStatus: 0,
+        referencesNo: "string",
+        consumeCycle: "string",
+        otherInfo: "string",
+        photoUrl: "string"
+      },
+      memberInfoRecords: [{
+        orderNo: "string",
+        memberNo: "string",
+        memberName: "string",
+        phone: "string",
+        consumeAmount: 0,
+        realPayAmount: 0,
+        profit: 0,
+        integral: 0,
+        remainDebt: 0,
+        consumeTime: "string",
+        remarks: "string",
+        consumeStore: "string",
+        consumeType: "string",
+        discountAmount: 0,
+        bedName: "string",
+        payInfo: "string",
+        memberStore: "string",
+        payType: "string"
+      }],
+      show: false,
+      currentTab: 'tab1', // 当前选中的 Tab
+      currentServiceTab: 'orderTab1', // 当前选中的 Tab
+      defaultColor: '#CCCCCC',
+      currentColor: '#FF0000',
+      completedColor: '#00FF00',
+      content: '一、本人所提供的个人信息 证明材料、证件',
+      signType: '',
+      signImg1: '',
+      tips2: '',
+      rules: {
+        phone: [
+          {
+            required: true,
+            min: 10,
+            max: 12,
+            message: '请输入11位电话号码',
+            trigger: ['blur', 'change'],
+          },
+          {
+            // 此为同步验证，可以直接返回true或者false，如果是异步验证，稍微不同，见下方说明
+            validator: (rule, value, callback) => {
+              // 调用uView自带的js验证规则，详见：https://www.uviewui.com/js/test.html
+              return !this.$isDataEmpty(value);
             },
-            // 服务条款对象信息
-            termOfService: {
-                aboutContent: "<p>会员协议会员协议会员协议会员协议会员协议会员协议</p>",
-                aboutType: "1",
-                createBy: "admin",
-                createTime: "2023-07-30 08:53:17",
-                id: "1685574269874098178",
-                status: "0",
-                updateBy: "admin",
-                updateTime: "2023-07-30 21:04:51"
+            message: "请认真填写电话号码",
+            trigger: ['blur', 'change'],
+          }
+        ],
+        memberName: [
+          {
+            required: true,
+            message: '请输入名字',
+            trigger: ['blur', 'change'],
+          },
+        ],
+        phonenumber: [
+          {
+            required: true,
+            min: 10,
+            max: 12,
+            message: '请输入11位电话号码',
+            trigger: ['blur', 'change'],
+          },
+          {
+            // 此为同步验证，可以直接返回true或者false，如果是异步验证，稍微不同，见下方说明
+            validator: (rule, value, callback) => {
+              // 调用uView自带的js验证规则，详见：https://www.uviewui.com/js/test.html
+              return !this.$isDataEmpty(value);
             },
-            userMemberInfo: {
-                memberNo: "string",
-                pingYinCode: "string",
-                memberName: "string",
-                integral: 0,
-                sex: 0,
-                birthday: "string",
-                phone: "string",
-                memberPassword: "string",
-                height: "string",
-                weight: "string",
-                memberCard: "string",
-                address: "string",
-                nowBalance: 0,
-                totalConsumeAmount: 0,
-                debt: 0,
-                remarks: "string",
-                joinTime: "string",
-                memberStatus: 0,
-                referencesNo: "string",
-                consumeCycle: "string",
-                otherInfo: "string",
-                photoUrl: "string"
-            },
-            memberInfoRecords: [{
-                orderNo: "string",
-                memberNo: "string",
-                memberName: "string",
-                phone: "string",
-                consumeAmount: 0,
-                realPayAmount: 0,
-                profit: 0,
-                integral: 0,
-                remainDebt: 0,
-                consumeTime: "string",
-                remarks: "string",
-                consumeStore: "string",
-                consumeType: "string",
-                discountAmount: 0,
-                bedName: "string",
-                payInfo: "string",
-                memberStore: "string",
-                payType: "string"
-            }],
-            show: false,
-            currentTab: 'tab1', // 当前选中的 Tab
-            currentServiceTab: 'orderTab1', // 当前选中的 Tab
-            defaultColor: '#CCCCCC',
-            currentColor: '#FF0000',
-            completedColor: '#00FF00',
-            content: '一、本人所提供的个人信息 证明材料、证件',
-            signType: '',
-            signImg1: '',
-            tips2: '',
-            rules: {
-                phone: [
-                    {
-                        required: true,
-                        min: 10,
-                        max: 12,
-                        message: '请输入11位电话号码',
-                        trigger: ['blur', 'change'],
-                    },
-                    {
-                        // 此为同步验证，可以直接返回true或者false，如果是异步验证，稍微不同，见下方说明
-                        validator: (rule, value, callback) => {
-                            // 调用uView自带的js验证规则，详见：https://www.uviewui.com/js/test.html
-                            return !this.$isDataEmpty(value);
-                        },
-                        message: "请认真填写电话号码",
-                        trigger: ['blur', 'change'],
-                    }
-                ],
-                memberName: [
-                    {
-                        required: true,
-                        message: '请输入名字',
-                        trigger: ['blur', 'change'],
-                    },
-                ],
-                phonenumber: [
-                    {
-                        required: true,
-                        min: 10,
-                        max: 12,
-                        message: '请输入11位电话号码',
-                        trigger: ['blur', 'change'],
-                    },
-                    {
-                        // 此为同步验证，可以直接返回true或者false，如果是异步验证，稍微不同，见下方说明
-                        validator: (rule, value, callback) => {
-                            // 调用uView自带的js验证规则，详见：https://www.uviewui.com/js/test.html
-                            return !this.$isDataEmpty(value);
-                        },
-                        message: "请认真填写电话号码",
-                        trigger: ['blur', 'change'],
-                    }
-                ],
-                smsCode: {
-                    required: true,
-                    min: 4,
-                    max: 6,
-                    message: '请认真填写验证码',
-                    trigger: ['blur', 'change'],
-                },
+            message: "请认真填写电话号码",
+            trigger: ['blur', 'change'],
+          }
+        ],
+        // smsCode: {
+        //   required: true,
+        //   min: 4,
+        //   max: 6,
+        //   message: '请认真填写验证码',
+        //   trigger: ['blur', 'change'],
+        // },
+      },
+
+    };
+  },
+  computed: {
+    itemObject(num) {
+      return (num) => ({
+        backgroundColor: item.background,
+        gridColumnStart: item.columnStart,
+        gridColumnEnd: item.columnEnd,
+        gridRowStart: item.rowStart,
+        gridRowEnd: item.rowEnd
+      })
+    }
+  },
 
-            },
-        };
-    },
-    onLoad() {
-        // 获取服务条款数据
-        this.getTermOfServiceByType();
+  onLoad() {
+    // 获取服务条款数据
+    // this.getTermOfServiceByType();
+  },
+
+  onUnload() {
+    if (this.timer) {
+      clearTimeout(this.timer);
+      this.timer = null;
+    }
+  },
+
+  onReady() {
+    this.$refs.form1.setRules(this.rules)
+  },
+
+  methods: {
+    // 关闭签名框
+    closeCanvas() {
+      this.showCanvas = false;
     },
-    onReady() {
-        this.$refs.form1.setRules(this.rules)
+    // 选择签名类型
+    personSing(type) {
+      this.showCanvas = true;
+      this.signType = type;
     },
-    methods: {
-        // 关闭签名框
-        closeCanvas() {
-            this.showCanvas = false;
+    // 保存签名信息
+    saveCanvasImg(path) {
+      console.log(path)
+      let that = this;
+      uni.uploadFile({
+        url: this.$host + '/resource/oss/upload', //仅为示例，非真实的接口地址
+        filePath: path,
+        name: 'file',
+        header: {
+          'Authorization': 'Bearer ' + that.$store.state.loginState.accessToken,
         },
-        // 选择签名类型
-        personSing(type) {
-            this.showCanvas = true;
-            this.signType = type;
-        },
-        // 保存签名信息
-        saveCanvasImg(path) {
-            console.log(path)
-            let that = this;
-            uni.uploadFile({
-                url: this.$host + '/resource/oss/upload', //仅为示例，非真实的接口地址
-                filePath: path,
-                name: 'file',
-                header: {
-                    'Authorization': 'Bearer ' + that.$store.state.loginState.accessToken,
-                },
-                success: (uploadFileRes) => {
-                    let res = JSON.parse(uploadFileRes.data)
-                    console.log(res)
-                    that.showCanvas = false;
-                }
-            });
-        },
-        codeChange2(text) {
-            this.tips2 = text;
-        },
-        getCode2() {
-            if (this.$refs.uCode2.canGetCode) {
-                this.$api.getSmsCode();
-            } else {
-                uni.$u.toast('倒计时结束后再发送');
-            }
-        },
-        // 获取手机验证码
-        getSmsCode() {
-            let that = this;
-            // 模拟向后端请求验证码
-            uni.showLoading({
-                title: '正在获取验证码'
-            })
-            this.$api.getSmsCode({ data: { phonenumber: this.userInfo.phonenumber, auth: true } }).then((res) => {
-                uni.hideLoading();
-                // 这里此提示会被this.start()方法中的提示覆盖
-                uni.$u.toast('验证码已发送');
-                // 通知验证码组件内部开始倒计时
-                that.$refs.uCode2.start();
-            }).catch(() => {
-                uni.showToast({
-                    title: "操作失败"
-                })
-            });
-        },
-        getStepClass(index) {
-            if (index < this.currentStep) {
-                return 'step';
-            } else if (index === this.currentStep) {
-                return ['step', 'active'];
-            } else {
-                return ['step', 'default'];
-            }
-        },
-        // 查询老会员系统数据
-        getOldMember() {
-            let that = this;
-            this.$api.getOldMember({ data: that.userInfo }).then((res) => {
-                if (!that.$isDataEmpty(res)) {
-                    that.userMemberInfo = res;
-                    that.userInfo.memberNo = res.memberNo;
-                    if (that.currentStep < that.steps.length - 1) {
-                        that.currentStep++;
-                    }
-                    // 查询充值记录
-                    that.$api.getOrderRechargeOldList();
-                } else {
-                    uni.$u.toast('未查询到数据');
-                }
-            }).catch(() => {
-                uni.showToast({
-                    title: "操作失败"
-                })
-            });
-        },
-        // 查询会员消费记录
-        getOrderConsumeLogOld() {
-            let that = this;
-            this.$api.getOrderConsumeLogOld({ data: this.userInfo }).then((res) => {
-                console.log(res)
-                that.memberInfoRecords = res;
-            }).catch(() => {
-                uni.showToast({
-                    title: "操作失败"
-                })
-            });
-        },
-        // 查询叶会员充值记录
-        getOrderRechargeOldList() {
-            this.$api.getOrderRechargeOldList({ data: this.userInfo }).then((res) => {
-                console.log(res)
-                this.memberInfoRecords = res;
-            }).catch(() => {
-                uni.showToast({
-                    title: "操作失败"
-                })
-            });
-        },
-        // 提交保存
-        submitOldData() {
-            let that = this;
-            this.$api.submitOldData(null, { data: that.userInfo }).then((res) => {
-                console.log(res)
-                if (this.currentStep < this.steps.length - 1) {
-                    this.currentStep++;
-                }
-            }).catch(() => {
-                uni.showToast({
-                    title: "操作失败"
-                })
-            });
-        },
-        nextStep(idx) {
-            if (idx == 0) { // 查询数据
-                this.$refs.form1.validate().then(res => {
-                    this.$api.getOldMember();
-                }).catch(errors => {
-                    uni.$u.toast('校验失败,请认真填写')
-                })
-            }
-
-            if (idx == 1) { // 显示查询数据
-                if (this.currentStep < this.steps.length - 1) {
-                    this.currentStep++;
-                }
-            }
-
-            if (idx == 2) { // 用户签名确认
-                this.$api.submitOldData();
-            }
-
-            if (idx == 3) { // 迁移成功，重新设置用户数据
-                // 刷新用户信息
-                this.$refreshUserLoginInfo();
-                uni.navigateTo({
-                    url: '/pages/index/index',
-
-                })
-            }
-        },
-        prevStep() {
-            if (this.currentStep > 0) {
-                this.currentStep--;
-            }
-        },
-        changeTab(tab) {
-            this.currentTab = tab;
-        },
-        // 服务订单
-        changeServiceTab(tab) {
-            if (tab == 'orderTab1') {
-                this.$api.getOrderRechargeOldList();
-            } else if (tab == 'orderTab2') {
-                this.$api.getOrderConsumeLogOld();
-            }
-            this.currentServiceTab = tab;
-        },
-        // 获取服务条款信息
-        getTermOfServiceByType() {
-            // 获取数据
-            this.$api.getTermOfServiceByType({ data: this.userInfo }).then((res) => {
-                if (res.aboutContent) {
-                    this.termOfService.aboutContent = res.aboutContent
-                } else {
-                    this.termOfService.aboutContent = "暂无信息！！！"
-                }
-            }).catch(() => {
-                uni.showToast({
-                    title: "操作失败"
-                })
-            });
-        },
-    }
+        success: (uploadFileRes) => {
+          let res = JSON.parse(uploadFileRes.data)
+          console.log(res)
+          that.showCanvas = false;
+        }
+      });
+    },
+    codeChange2(text) {
+      this.tips2 = text;
+    },
+    getCode2() {
+      if (this.$refs.uCode2.canGetCode) {
+        this.getSmsCode();
+      } else {
+        uni.$u.toast('倒计时结束后再发送');
+      }
+    },
+    // 获取手机验证码
+    getSmsCode() {
+      // 模拟向后端请求验证码
+      uni.showLoading({
+        title: '正在获取验证码'
+      })
+      this.$api.getSmsCode({phonenumber: this.userInfo.phone, auth: true}).then((res) => {
+        uni.hideLoading();
+        // 这里此提示会被this.start()方法中的提示覆盖
+        uni.$u.toast('验证码已发送');
+        // 通知验证码组件内部开始倒计时
+        this.$refs.uCode2.start();
+      }).catch(() => {
+        uni.showToast({
+          title: "操作失败"
+        })
+      });
+    },
+    getStepClass(index) {
+      if (index < this.currentStep) {
+        return 'step';
+      } else if (index === this.currentStep) {
+        return ['step', 'active'];
+      } else {
+        return ['step', 'default'];
+      }
+    },
+    // 查询老会员系统数据
+    getOldMember() {
+      // this.$api.getOldMember(this.userInfo).then((res) => {
+      //   if (!!res) {
+      //     this.userMemberInfo = res.data.data;
+      //     this.userInfo.memberNo = res.data.data.memberNo;
+      //   } else {
+      //     uni.$u.toast('未查询到数据');
+      //   }
+        // 查询充值记录
+        this.getOrderRechargeOldList();
+
+        this.timer = setTimeout(() => {
+          if (this.currentStep < this.steps.length - 1) {
+            this.currentStep++;
+          }
+        }, 0)
+      // }).catch((res) => {
+      //   uni.showToast({
+      //     title: "操作失败"
+      //   })
+      // });
+    },
+    // 查询会员消费记录
+    getOrderConsumeLogOld() {
+      this.$api.getOrderConsumeLogOld(this.userInfo).then((res) => {
+        this.memberInfoRecords = res.data.data;
+      }).catch(() => {
+        uni.showToast({
+          title: "操作失败"
+        })
+      });
+    },
+    // 查询叶会员充值记录
+    getOrderRechargeOldList() {
+      this.$api.getOrderRechargeOldList(this.userInfo).then((res) => {
+        this.memberInfoRecords = res.data.data;
+      }).catch(() => {
+        uni.showToast({
+          title: "操作失败"
+        })
+      });
+    },
+    // 提交保存
+    submitOldData() {
+      console.log(this.userInfo.memberNo)
+      this.userInfo.memberNo = '18902'
+      this.$api.submitOldData(this.userInfo).then((res) => {
+        console.log(res)
+        if (this.currentStep < this.steps.length - 1) {
+          this.currentStep++;
+        }
+      }).catch(() => {
+        uni.showToast({
+          title: "操作失败"
+        })
+      });
+    },
+    nextStep(idx) {
+      if (idx == 0) { // 查询数据
+        console.log(this.$refs.form1.validate(), '2222222222')
+        this.$refs.form1.validate().then(res => {
+          this.getOldMember();
+        }).catch(errors => {
+          uni.$u.toast('校验失败,请认真填写')
+        })
+      }
+
+      if (idx == 1) { // 显示查询数据
+        if (this.currentStep < this.steps.length - 1) {
+          this.currentStep++;
+        }
+      }
+
+      if (idx == 2) { // 用户签名确认
+        this.submitOldData();
+      }
+
+      if (idx == 3) { // 迁移成功，重新设置用户数据
+        uni.switchTab({
+          url: '/pages/index/index',
+        })
+      }
+    },
+    prevStep() {
+      if (this.currentStep > 0) {
+        this.currentStep--;
+      }
+    },
+    changeTab(tab) {
+      this.currentTab = tab;
+    },
+    // 服务订单
+    changeServiceTab(tab) {
+      if (tab == 'orderTab1') {
+        this.getOrderRechargeOldList();
+      } else if (tab == 'orderTab2') {
+        this.getOrderConsumeLogOld();
+      }
+      this.currentServiceTab = tab;
+    },
+    // 获取服务条款信息
+    getTermOfServiceByType() {
+      // 获取数据
+      this.$api.getTermOfServiceByType({data: this.userInfo}).then((res) => {
+        if (res.aboutContent) {
+          this.termOfService.aboutContent = res.aboutContent
+        } else {
+          this.termOfService.aboutContent = "暂无信息！！！"
+        }
+      }).catch(() => {
+        uni.showToast({
+          title: "操作失败"
+        })
+      });
+    },
+  }
 };
 </script>
 
 <style scoped lang="scss">
 .h-content-step-end {
-    height: 300px;
-    background: #fff;
-    text-align: center;
-    padding-top: 60px;
-    font-family: PingFangSC-Regular, PingFang SC;
+  height: 300px;
+  text-align: center;
+  padding-top: 60px;
+  font-family: PingFangSC-Regular, PingFang SC;
 
-    .h-success {
-        margin: 0 auto;
-        display: flex;
-        justify-content: center;
-        height: 80px;
-        width: 80px;
-        background: #f7fbf3;
-        border-radius: 40px;
-    }
-
-    .h-name {
-        margin-top: 20px;
-        height: 22px;
-        font-size: 14px;
-        font-weight: 400;
-        color: #666666;
-        line-height: 22px;
-    }
+  .h-success {
+    margin: 0 auto;
+    display: flex;
+    justify-content: center;
+    height: 80px;
+    width: 80px;
+    background: #f7fbf3;
+    border-radius: 40px;
+  }
+
+  .h-name {
+    margin-top: 20px;
+    height: 22px;
+    font-size: 14px;
+    font-weight: 400;
+    color: #666666;
+    line-height: 22px;
+  }
 
-    .h-btn {
-        margin: 0 auto;
-        margin-top: 40px;
-        width: 319px;
-        height: 42px;
-        background: #FFE05C;
-        border-radius: 27px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        font-size: 14px;
-    }
+  .h-btn {
+    margin: 0 auto;
+    margin-top: 40px;
+    width: 319px;
+    height: 42px;
+    background: #FFE05C;
+    border-radius: 27px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 14px;
+  }
 }
 
 .letter-commitment {
-    padding: 12px;
-    background: #fff;
+  padding: 12px;
+  background: #fff;
 
-    .h-title {
-        text-align: center;
-        font-size: 14px;
-    }
+  .h-title {
+    text-align: center;
+    font-size: 14px;
+  }
 }
 
 .col-border-2 {
-    margin-top: 12px;
+  margin-top: 12px;
 
-    .sign-wrap {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        height: 120px;
-        background: #FFFFFF;
-    }
+  .sign-wrap {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 120px;
+    background: #FFFFFF;
+  }
 }
 
 .sign-agree {
-    font-size: 14px;
-    font-weight: 400;
-    color: #666666;
-    line-height: 50px;
-    text-align: center;
+  font-size: 14px;
+  font-weight: 400;
+  color: #666666;
+  line-height: 50px;
+  text-align: center;
 }
 
 .h-content-wrap {
-    background: #fff;
-    padding-left: 12px;
-    padding-right: 12px;
+  background: #fff;
+  border-radius: 20rpx;
+  padding-left: 12px;
+  padding-right: 12px;
 }
 
 .h-content {
-    margin-bottom: 12px;
-    background-color: #fff;
-
-    .h-basic-info {
-        padding: 12px;
-        background: #fff;
-        border-radius: 6px;
-
-        .h-value {
-            display: flex;
-            font-family: PingFangSC-Regular, PingFang SC;
-            font-size: 14px;
-            font-weight: 400;
-
-            .h-name {
-                width: 56px;
-                height: 22px;
-                color: #999999;
-                line-height: 22px;
-                margin-right: 12px;
-            }
-
-            .h-text {
-                height: 22px;
-                color: #333333;
-                line-height: 22px;
-            }
-        }
+  margin-bottom: 12px;
+  background-color: #fff;
+
+  .h-basic-info {
+    padding: 12px;
+    background: whitesmoke;
+    border-radius: 6px;
+    margin: 20rpx;
+    .h-value {
+      display: flex;
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-size: 14px;
+      font-weight: 400;
+
+      .h-name {
+        width: 56px;
+        height: 22px;
+        color: #999999;
+        line-height: 22px;
+        margin-right: 12px;
+      }
+
+      .h-text {
+        height: 22px;
+        color: #333333;
+        line-height: 22px;
+      }
     }
+  }
+
+  .h-record {
+    margin-top: 24rpx;
+
+    /* 服务订单内容*/
+    .service-order-tab-bar {
+      background: #FAFAFA;
+      display: flex;
+      justify-content: space-around;
+      height: 50px;
+
+
+      .service-order-tab-item {
+        flex: 1;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 16px;
+        color: #333;
+        line-height: 26px;
+        margin: 10rpx;
+        border-radius: 10rpx;
+      }
+
+      .service-order-tab-item.active {
+        background-color: #fbe262;
+
+      }
+
 
-    .h-record {
-        margin-top: 12px;
-
-        /* 服务订单内容*/
-        .service-order-tab-bar {
-            background: #fff;
-            display: flex;
-            justify-content: space-around;
-            height: 50px;
-            background-color: #f5f5f5;
-
-            .service-order-tab-item {
-                flex: 1;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                font-size: 16px;
-                color: #333;
-                line-height: 26px;
-            }
-
-            .service-order-tab-item.active {
-                color: #ff0000;
-            }
-
-            .underline {
-                border-bottom: 2px solid #ff0000;
-            }
-        }
     }
+  }
 }
 
 .store-order-wrap {
-    padding: 12px;
+  padding: 12px;
+  .store-order {
+    background: #fff;
+    padding: 10px;
+    border-radius: 3px;
+    font-family: PingFangSC-Regular, PingFang SC;
 
-    .store-order {
-        background: #fff;
-        padding: 10px;
-        border-radius: 3px;
-        font-family: PingFangSC-Regular, PingFang SC;
-
-        .h-content {
-            .h-row {
-                display: flex;
-                justify-content: space-between;
-            }
-
-            .h-text {
-                font-size: 12px;
-                font-weight: 400;
-                color: #999999;
-                line-height: 20px;
-            }
-        }
+    .h-content {
+      .h-row {
+        display: flex;
+        justify-content: space-between;
+      }
+
+      .h-text {
+        font-size: 12px;
+        font-weight: 400;
+        color: #999999;
+        line-height: 20px;
+      }
     }
+  }
 }
 
 .h-footer {
-    text-align: right;
+  text-align: right;
 }
 
 
-
 .signature-wrap {
-    height: 120px;
-    width: 300px;
+  height: 120px;
+  width: 300px;
 }
 
 .step-bar {
-    padding: 12px;
-    display: flex;
-    justify-content: space-between;
-    margin-bottom: 20px;
+  padding: 12px;
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 20px;
 }
 
 .step {
-    position: relative;
-    /* width: 100%; */
-    // height: 40px;
-    /* background-color: #ccc; */
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    color: #fff;
+  position: relative;
+  /* width: 100%; */
+  // height: 40px;
+  /* background-color: #ccc; */
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #fff;
+
+  height: 30px;
+  width: 30px;
+  background: green;
+  border-radius: 15px;
+  margin: 0 auto;
+}
 
-    height: 30px;
-    width: 30px;
-    background: green;
-    border-radius: 15px;
-    margin: 0 auto;
+.h-num {
+  margin: 0 auto;
 }
 
-//.h-num {
-//    // height: 30px;
-//    // width: 30px;
-//    // background: #fff;
-//    // border-radius: 15px;
-//    // display: flex;
-//    // align-items: center;
-//    // justify-content: center;
-//}
+.head-ball {
+  transform: translateX(50%);
+  width: 60rpx;
+  height: 60rpx;
+  line-height: 60rpx;
+  border-radius: 30rpx;
+  background-color: #fbe362;
+  text-align: center;
+}
 
 .step.default {
-    color: #333;
-    background: #fff;
+  color: #333;
+  background: #fff;
 }
 
 .step.active {
-    color: #333;
-    background: #FFE05C;
+  color: #333;
+  background: #FFE05C;
 }
 
 .separator {
-    position: absolute;
-    top: 50%;
-    left: 130%;
-    transform: translateY(-50%);
-    width: 50px;
-    height: 2px;
-    border: 1px dashed #000;
+  position: absolute;
+  top: 50%;
+  left: 130%;
+  transform: translateY(-50%);
+  width: 50px;
+  height: 2px;
+  border: 1px dashed #000;
 }
 
 .form {
-    margin-bottom: 20px;
-    border-radius: 6px;
+  margin-bottom: 20px;
+  border-radius: 6px;
 }
 
 .button-group {
-    height: 60px;
-    position: fixed;
-    bottom: 0px;
-    left: 0px;
-    right: 0px;
+  height: 60px;
+  position: fixed;
+  bottom: 0px;
+  left: 0px;
+  right: 0px;
+  display: flex;
+  justify-content: space-between;
+  background: #fff;
+
+  .h-btn {
+    margin: 0 auto;
+    margin-top: 8px;
+    width: 200px;
+    height: 42px;
+    background: #FFE05C;
+    border-radius: 27px;
     display: flex;
-    justify-content: space-between;
-    background: #fff;
-
-    .h-btn {
-        margin: 0 auto;
-        margin-top: 8px;
-        width: 200px;
-        height: 42px;
-        background: #FFE05C;
-        border-radius: 27px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        font-size: 14px;
-    }
+    justify-content: center;
+    align-items: center;
+    font-size: 14px;
+  }
 }
 
 .identifying-code {
-    image {
-        width: 80px;
-        height: 30px;
-    }
+  image {
+    width: 80px;
+    height: 30px;
+  }
 }
 </style>

orderPages/bookService/index.vue

@@ -255,7 +255,39 @@ export default {
 
     //提交订单
     commitOrder() {
+      this.$api.commonGeneralOrder({
+        orderType: 1,
+        serviceObjectId: 1,
+        serviceAttribute: 2,
+        serviceStoreId: 1,
+        serviceTypeId: 1,
+        serviceDate: 1,
+        serviceUserId: 1,
+        serviceStartTime: 1,
+        timeRangeId: 1,
+        remark: 1
+      }).then(res => {
+        this.orderNo = res.data.data.orderNo
+        this.subOrderNo = res.data.data.subOrderNo
+        if (res.data.data.subOrderNo === null) {
+          uni.switchTab({
+            url: '/pages/order/index'
+          })
+        } else {
+          if (this.curServiceTab === 1) {
+            //开启余额支付密码框
+            // this.$refs.passwordPopup.open()
+
+            this.balancePay()
+
+          }
+          if (this.curServiceTab === 2) {
+            //调微信支付
+            this.wechatPay()
+          }
+        }
 
+      })
       if(!this.selectIcon){
         uni.$u.toast('请阅读并同意《预约需知》')
         return;

pages/index/index.vue

@@ -269,24 +269,18 @@ export default {
     const data = uni.getStorageSync('storeInfo');
     if (!data) {
       // 获取门店列表数据
-      console.log('+++++++++++++++++++++++++++++++++', this.userInfo)
       this.getStoreListData();
     } else {
       this.storeInfo = data;
     }
   },
   onLoad(e) {
-
-
-    console.log('6666666666666666666666666666666666',e)
-
     uni.hideTabBar({
       animation: false
     })
 
     if (e.scene){
       let scene = e.scene
-      console.log('7777777777777777777777777777777',scene)
       setTimeout(()=>{
         this.userInfo = uni.getStorageSync('userInfo');
         this.scanCode(this.userInfo.otherId,scene);

pages/my/index.vue

@@ -1,195 +1,193 @@
 <template>
-	<view class="page" :style="{'height':height}">
-		<view class="backImage">
-			<image class="backImage" src="/static/me/u655.png"></image>
-		</view>
-		<view class="content">
-
-				<view class="userInfo flex-row justify-between  ">
-					<view class="flex-row">
-						<view class="userPhoto" @click="navigateToPage('/myPages/userInfo/index')">
-							<image class="userPhoto" :src="userInfo.selfPhotoUrl || '/static/me/u4.png'"></image>
-						</view>
-						<view class="userTitle flex-col justify-center" @click="navigateToPage('/myPages/userInfo/index')">
-							<text class="nickName">HI,亲爱的{{ userInfo.ncikName }}</text>
-							<view class="flex-row">
-								<text class="xinxTitle">点击完善个人信息</text>
-								<u-icon name="arrow-right" color="#333333" size="16"></u-icon>
-							</view>
-						</view>
-					</view>
-
-					<view class="qrcodeView flex-col justify-center" @click="navigateToPage('/pages/qrCode/index')">
-						<image class="qrcode" src="/static/me/u5.png"></image>
-						<text class="qrcodeTitle">会员码</text>
-					</view>
-
-				</view>
-
-				<view class="sudoku flex-col">
-					<view class="balance-name">
-						<text>我的资产</text>
-					</view>
-					<view class="balance flex-row justify-around">
-						<view class="balanceItem" @click="navigateToPage('/myPages/recharge/index')">
-							<view class="icon flex-row justify-center">
-								<u-icon name="/static/me/u701.png" color="red" size="30"></u-icon>
-							</view>
-							<view class="name">
-								余额
-							</view>
-							<view class="num">
-								<text>￥{{userInfo.balance || 0}}</text>
-							</view>
-						</view>
-						<view class="balanceItem">
-							<view class="icon flex-row justify-center">
-								<u-icon name="/static/me/u680.png" color="red" size="30"></u-icon>
-							</view>
-							<view class="name">
-								积分
-							</view>
-							<view class="num">
-								<text>{{userInfo.integral|| 0}}</text>
-							</view>
-						</view>
-						<view class="balanceItem" @click="navigateToPage('/orderPages/myCoupon/index')">
-							<view class="icon flex-row justify-center">
-								<u-icon name="/static/me/u687.png" color="red" size="30"></u-icon>
-							</view>
-							<view class="name">
-								优惠券
-							</view>
-							<view class="num">
-								<text>{{userInfo.coupon || 0}}</text>
-							</view>
-						</view>
-						<view class="balanceItem" @click="navigateToPage('/storePages/myRights/index')">
-							<view class="icon flex-row justify-center">
-								<u-icon name="/static/me/u694.png" color="red" size="30"></u-icon>
-							</view>
-							<view class="name">
-								我的权益卡
-							</view>
-							<view class="num">
-								<text>{{userInfo.equityCardTotal || 0}}</text>
-							</view>
-						</view>
-					</view>
-
-				</view>
-
-				<view class="group">
-					<uni-list>
-						<uni-list-item :to="item.to" :title="item.title" showArrow :thumb="item.thumb" thumb-size="sm" :rightText="item.rightText"  v-for="(item,index) in group1" :key="index" />
-					</uni-list>
-				</view>
-
-<!--				<view class="group">-->
-<!--					<uni-list>-->
-<!--						<uni-list-item :to="item.to" :title="item.title" showArrow :thumb="item.thumb" thumb-size="sm"  v-for="(item,index) in group2" :key="index" />-->
-<!--					</uni-list>-->
-<!--				</view>-->
-
-				<view class="tabBarLineHeight"></view>
-
-		</view>
-		<view class="tabBarView">
-			<tab-bar :tabIndex="tabIndex"></tab-bar>
-		</view>
-	</view>
+  <view class="page" :style="{'height':height}">
+    <view class="backImage">
+      <image class="backImage" src="/static/me/u655.png"></image>
+    </view>
+    <view class="content">
+
+      <view class="userInfo flex-row justify-between  ">
+        <view class="flex-row">
+          <view class="userPhoto" @click="navigateToPage('/myPages/userInfo/index')">
+            <image class="userPhoto" :src="userInfo.selfPhotoUrl || '/static/me/u4.png'"></image>
+          </view>
+          <view class="userTitle flex-col justify-center" @click="navigateToPage('/myPages/userInfo/index')">
+            <text class="nickName">HI,亲爱的{{ userInfo.ncikName }}</text>
+            <view class="flex-row">
+              <text class="xinxTitle">点击完善个人信息</text>
+              <u-icon name="arrow-right" color="#333333" size="16"></u-icon>
+            </view>
+          </view>
+        </view>
+
+        <view class="qrcodeView flex-col justify-center" @click="navigateToPage('/pages/qrCode/index')">
+          <image class="qrcode" src="/static/me/u5.png"></image>
+          <text class="qrcodeTitle">会员码</text>
+        </view>
+
+      </view>
+
+      <view class="sudoku flex-col">
+        <view class="balance-name">
+          <text>我的资产</text>
+        </view>
+        <view class="balance flex-row justify-around">
+          <view class="balanceItem" @click="navigateToPage('/myPages/recharge/index')">
+            <view class="icon flex-row justify-center">
+              <u-icon name="/static/me/u701.png" color="red" size="30"></u-icon>
+            </view>
+            <view class="name">
+              余额
+            </view>
+            <view class="num">
+              <text>￥{{ userInfo.balance || 0 }}</text>
+            </view>
+          </view>
+          <view class="balanceItem">
+            <view class="icon flex-row justify-center">
+              <u-icon name="/static/me/u680.png" color="red" size="30"></u-icon>
+            </view>
+            <view class="name">
+              积分
+            </view>
+            <view class="num">
+              <text>{{ userInfo.integral || 0 }}</text>
+            </view>
+          </view>
+          <view class="balanceItem" @click="navigateToPage('/orderPages/myCoupon/index')">
+            <view class="icon flex-row justify-center">
+              <u-icon name="/static/me/u687.png" color="red" size="30"></u-icon>
+            </view>
+            <view class="name">
+              优惠券
+            </view>
+            <view class="num">
+              <text>{{ userInfo.coupon || 0 }}</text>
+            </view>
+          </view>
+          <view class="balanceItem" @click="navigateToPage('/storePages/myRights/index')">
+            <view class="icon flex-row justify-center">
+              <u-icon name="/static/me/u694.png" color="red" size="30"></u-icon>
+            </view>
+            <view class="name">
+              我的权益卡
+            </view>
+            <view class="num">
+              <text>{{ userInfo.equityCardTotal || 0 }}</text>
+            </view>
+          </view>
+        </view>
+
+      </view>
+
+      <view class="group">
+        <uni-list>
+          <uni-list-item :to="item.to" :title="item.title" showArrow :thumb="item.thumb" thumb-size="sm"
+                         :rightText="item.rightText" v-for="(item,index) in group1" :key="index"/>
+        </uni-list>
+      </view>
+
+      <!--				<view class="group">-->
+      <!--					<uni-list>-->
+      <!--						<uni-list-item :to="item.to" :title="item.title" showArrow :thumb="item.thumb" thumb-size="sm"  v-for="(item,index) in group2" :key="index" />-->
+      <!--					</uni-list>-->
+      <!--				</view>-->
+
+      <view class="tabBarLineHeight"></view>
+
+    </view>
+    <view class="tabBarView">
+      <tab-bar :tabIndex="tabIndex"></tab-bar>
+    </view>
+  </view>
 </template>
 
-<script >
+<script>
 import tabBar from "../../components/tabBar/tabBar";
+
 export default {
-	components: {
-		tabBar
-	},
-	data() {
-		return {
-			group1:[
-				// {thumb:'/static/me/u1796.png',title:'贡献奖励记录',rightText:'',to:''},
-				// {thumb:'/static/me/u1803.png',title:'实名认证',rightText:'',to:'/myPages/realNameAuth/index'},
-				{thumb:'/static/me/u1812.png',title:'服务对象管理',rightText:'',to:'/myPages/ServiceObjectManagement/index'},
-        		{thumb:'/static/me/u3.png',title:'邀请有礼',rightText:'',to:'/myPages/promotionCenter/index'},
-				// {thumb:'/static/me/u1833.png',title:'新老系统切换',rightText:'',to:'/myPages/systemSwitch/index'},
-				{thumb:'/static/me/u826.png',title:'储值服务',rightText:'',to:'/myPages/recharge/index'},
-				{thumb:'/static/me/u701.png',title:'交易记录',rightText:'',to:'/myPages/transactionRecord/index'},
-        		{thumb:'/static/me/u11.png',title:'会员须知',rightText:'',to:'/myPages/aboutOur/index'}
-			],
-			group2:[
-
-				// {thumb:'/static/me/u10.png',title:'个人信息',rightText:'',to:'/myPages/userInfo/index'},
-				// {thumb:'/static/me/u101.png',title:'设置',rightText:'',to:'/myPages/setting/index'}
-			],
-			height:'',
-			title: 'Hello',
-			tabIndex: 4,
-			userInfo: {}
-		}
-	},
-
-	// 分享到朋友圈
-	onShareTimeline() { },
-	// 分享到用户
-	onShareAppMessage(OBJECT) { },
-	onLoad() {
-
-
-
-		uni.hideTabBar({
-			animation:false
-		})
-		let sysInfo = uni.getSystemInfoSync()
-		this.height = sysInfo.screenHeight +'px'
-	},
-
-	onShow(){
-		// this.userInfo = uni.getStorageSync('userInfo')
-		// if (this.userInfo.isAttestation){
-		// 	this.group1[0].rightText = '已认证'
-		// }else {
-		// 	this.group1[0].rightText = '未实名认证，去认证'
-		// }
-
-
-		this.getUserInfo()
-
-
-	},
-
-	methods: {
-
-		getUserInfo(){
-			this.$api.getUserInfo().then(res=>{
-				console.log('++++++++++++获取用户信息++++++++++++++++++',res)
-				uni.setStorageSync('userInfo',res.data.data)
-				this.userInfo = res.data.data
-				this.getImgUrlByOssId(this.userInfo.selfPhoto)
-			})
-		},
-
-		getImgUrlByOssId(Id){
-		  if (Id) {
-        this.$api.getImage(Id).then(res=>{
+  components: {
+    tabBar
+  },
+  data() {
+    return {
+      group1: [
+        // {thumb:'/static/me/u1796.png',title:'贡献奖励记录',rightText:'',to:''},
+        // {thumb:'/static/me/u1803.png',title:'实名认证',rightText:'',to:'/myPages/realNameAuth/index'},
+        {thumb: '/static/me/u1812.png', title: '服务对象管理', rightText: '', to: '/myPages/ServiceObjectManagement/index'},
+        {thumb: '/static/me/u3.png', title: '邀请有礼', rightText: '', to: '/myPages/promotionCenter/index'},
+        {thumb: '/static/me/u1833.png', title: '新老系统切换', rightText: '', to: '/myPages/systemSwitch/index'},
+        {thumb: '/static/me/u826.png', title: '储值服务', rightText: '', to: '/myPages/recharge/index'},
+        {thumb: '/static/me/u701.png', title: '交易记录', rightText: '', to: '/myPages/transactionRecord/index'},
+        {thumb: '/static/me/u11.png', title: '会员须知', rightText: '', to: '/myPages/aboutOur/index'}
+      ],
+      group2: [
+
+        // {thumb:'/static/me/u10.png',title:'个人信息',rightText:'',to:'/myPages/userInfo/index'},
+        // {thumb:'/static/me/u101.png',title:'设置',rightText:'',to:'/myPages/setting/index'}
+      ],
+      height: '',
+      title: 'Hello',
+      tabIndex: 4,
+      userInfo: {}
+    }
+  },
+
+  // 分享到朋友圈
+  onShareTimeline() {
+  },
+  // 分享到用户
+  onShareAppMessage(OBJECT) {
+  },
+  onLoad() {
+
+
+    uni.hideTabBar({
+      animation: false
+    })
+    let sysInfo = uni.getSystemInfoSync()
+    this.height = sysInfo.screenHeight + 'px'
+  },
+
+  onShow() {
+    // this.userInfo = uni.getStorageSync('userInfo')
+    // if (this.userInfo.isAttestation){
+    // 	this.group1[0].rightText = '已认证'
+    // }else {
+    // 	this.group1[0].rightText = '未实名认证，去认证'
+    // }
+    this.getUserInfo()
+  },
+
+  methods: {
+    getUserInfo() {
+      this.$api.getUserInfo().then(res => {
+        console.log('++++++++++++获取用户信息++++++++++++++++++', res)
+        uni.setStorageSync('userInfo', res.data.data)
+        this.userInfo = res.data.data
+        this.getImgUrlByOssId(this.userInfo.selfPhoto)
+      })
+    },
+
+    getImgUrlByOssId(Id) {
+      if (Id) {
+        this.$api.getImage(Id).then(res => {
           this.userInfo.selfPhotoUrl = res.data.data[0].url.replace(/^http:/, "https:")
-			this.$set(this.userInfo)
+          this.$set(this.userInfo)
         });
       }
-		},
-		navigateToPage(url){
-			uni.navigateTo({
-				url:url
-			})
-		},
+    },
+    navigateToPage(url) {
+      uni.navigateTo({
+        url: url
+      })
+    },
 
 
-	}
+  }
 }
 </script>
 
 <style>
-	@import '/common/css/common.css';
-	@import './index.rpx.css';
+@import '/common/css/common.css';
+@import './index.rpx.css';
 </style>