li.shaoyi 2 år sedan
förälder
incheckning
00d24b6778

+ 5 - 3
src/packages/mobile/views/boot/index.vue

@@ -8,7 +8,7 @@
         <img src="@mobile/assets/images/guide-1.png" />
       </SwipeItem>
       <SwipeItem>
-        <img src="@mobile/assets/images/guide-2.png" @click="skip(onLoad)" />
+        <img src="@mobile/assets/images/guide-2.png" @click="skip(init())" />
       </SwipeItem>
     </Swipe>
   </div>
@@ -26,7 +26,6 @@ import plus from '@/utils/h5plus'
 const { logining, initBaseData } = useLogin()
 const route = useRoute()
 const router = useRouter()
-const onLoad = initBaseData(true) // 初始化数据
 const countdown = 1  // 倒计时秒数
 
 const state = reactive({
@@ -36,6 +35,9 @@ const state = reactive({
   rate: 100, // 目标进度
 })
 
+const init = () => initBaseData(true) // 初始化数据
+const onLoad = state.showGuide ? Promise.resolve() : init()
+
 // 倒计时
 const timer = window.setInterval(() => {
   state.second--
@@ -82,7 +84,7 @@ const tryInit = () => {
     cancelButtonText: '退出',
     confirmButtonText: '重试'
   }).then(() => {
-    skip(initBaseData(true))
+    skip(init())
   }).catch(() => {
     plus.quit()
   })

+ 2 - 2
src/packages/mobile/views/credit/signin/index.vue

@@ -86,7 +86,7 @@
                         <Button type="primary" round @click="toPurchase">去完成</Button>
                     </div>
                 </dd>
-                <dd class="list-item">
+                <!-- <dd class="list-item">
                     <div class="list-item__title">
                         <div class="title-icon">
                             <img src="@mobile/assets/icons/goods.png" />
@@ -99,7 +99,7 @@
                     <div class="list-item__button">
                         <Button type="primary" round @click="toSupplyDemand">去完成</Button>
                     </div>
-                </dd>
+                </dd> -->
             </dl>
         </div>
         <app-register-code v-model:show="showQRCode" :text="userAccount.refernum" />

+ 6 - 6
src/packages/mobile/views/home/index.vue

@@ -46,12 +46,12 @@ const tabList: Tabbar[] = [
     icon: 'icon-purchase',
     activeIcon: 'icon-purchase-active',
   },
-  {
-    name: 'supplyDemand',
-    label: '供求',
-    icon: 'icon-supply-demand',
-    activeIcon: 'icon-supply-demand-active',
-  },
+  // {
+  //   name: 'supplyDemand',
+  //   label: '供求',
+  //   icon: 'icon-supply-demand',
+  //   activeIcon: 'icon-supply-demand-active',
+  // },
   {
     name: 'mine',
     label: '我的',

+ 5 - 5
src/packages/mobile/views/mine/wareorder/list/components/holdlb/index.vue

@@ -26,7 +26,7 @@
                         </table>
                     </div>
                     <div class="section-item__btnbar">
-                        <Button size="small" round @click="listing(item)">挂牌</Button>
+                        <!-- <Button size="small" round @click="listing(item)">挂牌</Button> -->
                         <Button size="small" round @click="pickup(item)">提货</Button>
                     </div>
                 </li>
@@ -64,10 +64,10 @@ const pickup = (item: Model.HoldLBRsp) => {
     openComponent('pickup')
 }
 
-const listing = (item: Model.HoldLBRsp) => {
-    selectedRow.value = item
-    openComponent('listing')
-}
+// const listing = (item: Model.HoldLBRsp) => {
+//     selectedRow.value = item
+//     openComponent('listing')
+// }
 
 const onRefresh = (finish: () => void) => {
     /// 查询未完成

+ 2 - 2
src/packages/mobile/views/user/register/index.vue

@@ -18,7 +18,7 @@
         </Field>
         <Field v-model="formData.loginpwd" name="loginpwd" type="password" label="登录密码" placeholder="必填"
           autocomplete="off" :rules="formRules.loginpwd" />
-        <Field v-model="formData.refernum" name="refernum" label="推荐码" placeholder="必填" autocomplete="off"
+        <Field v-model="formData.refernum" name="refernum" label="注册编码" placeholder="必填" autocomplete="off"
           :rules="formRules.refernum">
           <!-- <template #button>
             <app-qrcode-scan @success="onScanSuccess">
@@ -120,7 +120,7 @@ const formRules: { [key in keyof Model.RegisterReq]?: FieldRule[] } = {
   }],
   refernum: [{
     required: true,
-    message: '请输入推荐码',
+    message: '请输入注册编码',
   }],
 }
 

+ 7 - 2
src/services/index.ts

@@ -33,12 +33,17 @@ export default new (class {
     isReady = false
 
     /** 等待服务初始化 */
-    private isPending = true
+    private isPending = false
 
     /**
      * 自动初始化,若断网或其它原因导致初始化失败,需手动初始化
      */
-    private onload = this.init()
+    //private onload = this.init()
+
+    /**
+     * 手动初始化
+     */
+    private onload = Promise.resolve(this.config)
 
     /**
      * 重试次数