Эх сурвалжийг харах

feat: 完善测试版本相关工具

zhangyuhan 1 жил өмнө
parent
commit
48245de6c2

+ 1 - 0
project-config/index.js

@@ -11,6 +11,7 @@ const projectInfo = {
   // 小程序配置相关
   // 小程序配置相关
   appId: 'wxd9e11d95ceecf941',
   appId: 'wxd9e11d95ceecf941',
   appName: '物业 | 最新采购',
   appName: '物业 | 最新采购',
+  appCode: 'wy_zbxm',
   appType: 'cgyx',
   appType: 'cgyx',
   appDesc: '',
   appDesc: '',
   payAppId: '',
   payAppId: '',

+ 8 - 0
src/api/modules/user.js

@@ -8,6 +8,14 @@ export function ajaxUserLogin(data) {
     data
     data
   })
   })
 }
 }
+// 用户登录
+export function ajaxUserLogout(data) {
+  return request({
+    url: '/debrisproduct/logout',
+    method: 'post',
+    data
+  })
+}
 
 
 // 用户手机号上报
 // 用户手机号上报
 export function ajaxSetUserPhone(data) {
 export function ajaxSetUserPhone(data) {

+ 1 - 0
src/pages/order/create/index.vue

@@ -296,6 +296,7 @@ export default {
     },
     },
     onAreaCountRadioChange ({ detail }) {
     onAreaCountRadioChange ({ detail }) {
       this.selectedInfo.radio = detail
       this.selectedInfo.radio = detail
+      this.activeSpec = this.formatSpecList[0].id
     },
     },
     setRadioNum(count) {
     setRadioNum(count) {
       this.selectedInfo.areaCount = count
       this.selectedInfo.areaCount = count

+ 2 - 2
src/pages/order/detail/index.vue

@@ -61,7 +61,7 @@
             </div>
             </div>
           </div>
           </div>
         </div>
         </div>
-        <div class="j-button-group j-footer" v-show="buttonGroupShow">
+        <div class="j-button-group j-footer fix-safe" v-show="buttonGroupShow">
           <button
           <button
             class="j-button-confirm pay"
             class="j-button-confirm pay"
             v-if="orderStateMap[orderInfo.state].bottomButtonShow.pay"
             v-if="orderStateMap[orderInfo.state].bottomButtonShow.pay"
@@ -402,7 +402,7 @@ export default {
   &.j-container.transparent-header > .j-header {
   &.j-container.transparent-header > .j-header {
     position: absolute;
     position: absolute;
     z-index: 6;
     z-index: 6;
-    top: 32px;
+    top: 64px;
     left: 0;
     left: 0;
     width: 100%;
     width: 100%;
     background-color: transparent;
     background-color: transparent;

+ 1 - 1
src/pages/order/pay/index.vue

@@ -57,7 +57,7 @@ export default {
       ajaxGetPayConfig({
       ajaxGetPayConfig({
         orderCode: id
         orderCode: id
       }).then(res => {
       }).then(res => {
-        if (res.sss) {
+        if (res.error_code === 0) {
           if (res.data?.price) {
           if (res.data?.price) {
             this.payInfo.price = res.data.price
             this.payInfo.price = res.data.price
           }
           }

+ 17 - 2
src/pages/tabbar/mine/index.vue

@@ -67,6 +67,17 @@
         </van-cell-group>
         </van-cell-group>
       </div>
       </div>
     </div>
     </div>
+
+    <div class="menu-card-group">
+      <van-cell-group :border="false" inset title="测试相关">
+        <van-cell :border="false" title="AppID" :value="appConfig.projectInfo.appId"></van-cell>
+        <van-cell :border="false" title="Code" :value="appConfig.projectInfo.appCode"></van-cell>
+        <van-cell :border="false" title="SESSION" :value="userState.sessionId"></van-cell>
+        <van-cell :border="false" title="清除本地缓存" @click="doClear"></van-cell>
+        <van-cell :border="false" title="退出登录状态" @click="doLogout"></van-cell>
+      </van-cell-group>
+    </div>
+
     <PopupCustomerQR v-model="showCustomer" />
     <PopupCustomerQR v-model="showCustomer" />
   </div>
   </div>
 </template>
 </template>
@@ -75,7 +86,7 @@ import {Cell, CellGroup, Popup} from 'vant'
 import UseLogin from "@/components/login/useLogin.vue";
 import UseLogin from "@/components/login/useLogin.vue";
 import Taro from "@tarojs/taro";
 import Taro from "@tarojs/taro";
 import {mapActions, mapGetters} from "vuex";
 import {mapActions, mapGetters} from "vuex";
-import { formatPhoneNumber, goToOrderList, goToUnitDetail } from "@/utils";
+import { formatPhoneNumber, showToast } from "@/utils";
 import adSingle from '@/components/common/Ad.vue'
 import adSingle from '@/components/common/Ad.vue'
 import {setTrackLog} from "@/track";
 import {setTrackLog} from "@/track";
 import PopupCustomerQR from '@/components/common/PopupCustomerQR.vue'
 import PopupCustomerQR from '@/components/common/PopupCustomerQR.vue'
@@ -104,7 +115,7 @@ export default {
     ...mapGetters('env', ['miniEnv', 'canSupportPay']),
     ...mapGetters('env', ['miniEnv', 'canSupportPay']),
     ...mapGetters('config', ['appConfig']),
     ...mapGetters('config', ['appConfig']),
     nowUserPhone() {
     nowUserPhone() {
-      return formatPhoneNumber(this.userState.phone)
+      return formatPhoneNumber(this.userState.phone || '')
     },
     },
     nowUserType() {
     nowUserType() {
       if (!this.isLogin) {
       if (!this.isLogin) {
@@ -115,6 +126,10 @@ export default {
   },
   },
   methods: {
   methods: {
     ...mapActions('user', ['doLogout', 'doGetUserInfo']),
     ...mapActions('user', ['doLogout', 'doGetUserInfo']),
+    doClear () {
+      Taro.clearStorageSync()
+      showToast('清除成功')
+    },
     doSetTrackLog (name, data = {}) {
     doSetTrackLog (name, data = {}) {
       setTrackLog({
       setTrackLog({
         breakName: name,
         breakName: name,

+ 16 - 4
src/store/modules/user.js

@@ -1,7 +1,7 @@
 import { getIpAddressArea } from "@/api/modules/search";
 import { getIpAddressArea } from "@/api/modules/search";
-import {saveStorage, useStorage} from "@/utils";
+import {saveStorage, useStorage, showToast} from "@/utils";
 import Taro from "@tarojs/taro";
 import Taro from "@tarojs/taro";
-import { ajaxGetUserInfo, ajaxUserLogin, ajaxSetUserPhone } from "@/api/modules/user";
+import { ajaxGetUserInfo, ajaxUserLogin, ajaxSetUserPhone, ajaxUserLogout } from "@/api/modules/user";
 
 
 const CACHE_ADDRESS_KEY = 'USER_ADDRESS'
 const CACHE_ADDRESS_KEY = 'USER_ADDRESS'
 const CACHE_USER_KEY = 'USER_INFO'
 const CACHE_USER_KEY = 'USER_INFO'
@@ -121,9 +121,21 @@ export default {
         }
         }
       })
       })
     },
     },
-    doLogout ({ commit }) {
+    async doLogout ({ commit }) {
+      await ajaxUserLogout().then(res => {
+        console.log(res)
+      }).catch(e => {
+        console.log(e)
+        showToast('接口异常')
+      })
       commit('setLoginState', false)
       commit('setLoginState', false)
-      commit('doSetUserInfo', {})
+      commit('doSetUserInfo', {
+        areaCount: 0,
+        isPay: false,
+        orderCount: 0,
+        ownerCount: 0,
+        phone: ""
+      })
       commit('doSetUserPhoneInfo', '')
       commit('doSetUserPhoneInfo', '')
     },
     },
     doGetIpArea ({ commit, getters }) {
     doGetIpArea ({ commit, getters }) {