소스 검색

修改问题

tangning 2 년 전
부모
커밋
3d66e2074a
7개의 변경된 파일26개의 추가작업 그리고 22개의 파일을 삭제
  1. 3 3
      src/layout/basic/index.vue
  2. 1 2
      src/router/index.ts
  3. 1 1
      src/store/modules/user.ts
  4. 1 1
      src/views/detail/index.vue
  5. 10 1
      src/views/detail/payment.vue
  6. 10 9
      src/views/home/list.vue
  7. 0 5
      src/views/home/submit.vue

+ 3 - 3
src/layout/basic/index.vue

@@ -5,12 +5,12 @@
       <router-view v-if="$route.meta.keepAlive" :key="$route.path" />
     </keep-alive>
     <router-view v-if="!$route.meta.keepAlive" :key="$route.path" /> -->
-    <RouterView v-slot="{ Component }" v-if="$route.meta.keepAlive">
+    <!-- <RouterView v-slot="{ Component }" v-if="$route.meta.keepAlive">
       <keep-alive>
         <component :is="Component" :key="$route.path" />
       </keep-alive>
-    </RouterView>
-    <RouterView v-if="!$route.meta.keepAlive" :key="$route.path" />
+    </RouterView> -->
+    <RouterView :key="$route.path" />
   </div>
   <!-- <nut-tabbar unactive-color="#364636" active-color="#1989fa" @tab-switch="tabSwitch" bottom v-model:visible="activeTab">
     <nut-tabbar-item v-for="item in tabItem" :key="item.key" :tab-title="$t(`tabbar.${item.key}`)" :icon="item.icon" />

+ 1 - 2
src/router/index.ts

@@ -1,8 +1,7 @@
 import { createRouter, createWebHistory, Router } from 'vue-router';
 import routes from './routes';
-
 const router: Router = createRouter({
-  history: createWebHistory('/'),
+  history: createWebHistory(),
   routes: routes,
 });
 

+ 1 - 1
src/store/modules/user.ts

@@ -16,7 +16,7 @@ export const useUserStore = defineStore({
   id: 'user',
   state: (): StoreUser => ({
     token: token,
-    wxOpenId:'',
+    wxOpenId:'oNt5bt847hNZVI7NnnVVOkZUxN2A',
     info: {
       name:'test',
       wxOpenId:'test1',

+ 1 - 1
src/views/detail/index.vue

@@ -32,7 +32,7 @@
       <van-divider v-if="processList?.length >1">
         <div @click="handleShow">
           <van-icon :name="stepShow ? 'arrow-down' : 'arrow-up'" />
-          {{ stepShow ? '展开' : '收起' }}
+          {{ !stepShow ? '展开' : '收起' }}
         </div>
       </van-divider>
     </div>

+ 10 - 1
src/views/detail/payment.vue

@@ -11,7 +11,7 @@
       </div>
     </div>
     <div class="but">
-      <van-button type="primary"  block>支付</van-button>
+      <van-button type="primary" @click="payOrder" block>支付</van-button>
     </div>
   </div>
 </template>
@@ -36,6 +36,15 @@
     })
     detail.value.amount = amount
   });
+  
+  function payOrder() {
+    //获取code
+    let urlNow = encodeURIComponent(window.location.href);
+    let scope = 'snsapi_base'; //snsapi_userinfo   //静默授权 用户无感知
+    let appid = 'wxac3d59ea82d9b82a';
+    let url = `https://open.weixin.qq.com/connect/oauth2/authorize?redirect_uri=${urlNow}&appid=${appid}&response_type=code&scope=${scope}&connect_redirect=1#wechat_redirect`;
+    window.location.replace(url);
+  }
    // 判断是否在微信浏览器  1为微信浏览器 2为其他  这个方法定义在外面,后面也会用到
 
 </script>

+ 10 - 9
src/views/home/list.vue

@@ -2,9 +2,9 @@
   <div class="list">
     <van-list style="overflow: hidden" :finished="loading" finished-text="没有更多了">
       <!-- <van-cell v-for="item in list" :key="item" :title="item" /> -->
-      <div class="item" v-for="item in list" :key="item" @click="goRoute(`detail/${item?.repairId}`)">
+      <div class="item" v-for="item in list" :key="item" @click="goRoute(`detail/${item.repairId}`)">
         <div class="item_top padddiv">
-          <div class="orderSn">工单号: <span>{{item?.repairId}}</span></div>
+          <div class="orderSn">工单号: <span>{{item.repairId}}</span></div>
           <div class="state">{{status[item.status]}}</div>
         </div>
         <div class="content padddiv">
@@ -18,10 +18,10 @@
           <div class="time">报修日期 {{ dayjs(item.createTime).format('YYYY-MM-DD') }}</div>
           <div class="butList">
             <!-- <van-button @click.stop="goRoute(`payment/${item}`)" hairline size="small" type="primary" >支付</van-button> -->
-            <van-button v-if="item?.status == 3" @click.stop="goRoute(`payment/${item?.repairId}`)" plain hairline size="small">支付</van-button>
-            <van-button v-if="item?.status == 9" @click.stop="goRoute(`repair/${item?.repairId}`)" plain hairline size="small">待确认</van-button>
-            <van-button v-if="item?.status == 13" @click.stop="goRoute(`evaluate/${item?.repairId}`)" plain hairline size="small">评价</van-button>
-            <van-button v-if="item?.status == 23" @click.stop="goRoute(`invoice/${item?.repairId}`)" plain hairline size="small">申请开票</van-button>
+            <van-button v-if="item.status == 3" @click.stop="goRoute(`payment/${item.repairId}`)" plain hairline size="small">支付</van-button>
+            <van-button v-if="item.status == 9" @click.stop="goRoute(`repair/${item.repairId}`)" plain hairline size="small">待确认</van-button>
+            <van-button v-if="item.status == 13" @click.stop="goRoute(`evaluate/${item.repairId}`)" plain hairline size="small">评价</van-button>
+            <van-button v-if="item.status == 23" @click.stop="goRoute(`invoice/${item.repairId}`)" plain hairline size="small">申请开票</van-button>
           </div>
         </div>
       </div>
@@ -50,7 +50,7 @@ const props = defineProps({
   },
 });
 const { active } = toRefs(props);
-const list = ref<any>([]);
+const list = ref<[any]>([]);
 const loading = ref(false);
 console.log('userStore',userStore)
 const wxOpenId = computed(() => {
@@ -88,9 +88,9 @@ const myData = reactive({
 });
 const onLoad = async () => {
   loading.value = false;
-  const data = await repairList({wxOpenId:wxOpenId.value});
+  const {data} = await repairList({wxOpenId:wxOpenId.value});
   console.log('data',data)
-  list.value = data
+  list.value = data || []
   loading.value = true;
 };
 // const onDetail = (item) => {
@@ -104,6 +104,7 @@ const goRoute = (path) => {
 </script>
 <style lang="scss" scoped>
 .list {
+  min-height: calc(100vh - 48px);
   background-color: #f5f5f5;
   .item {
     margin: 10px 0;

+ 0 - 5
src/views/home/submit.vue

@@ -132,11 +132,6 @@
       />
     </van-cell-group>
     <div style="margin: 16px">
-      <nut-icon name="JD"></nut-icon>
-      <nut-icon
-        size="40"
-        name="https://img11.360buyimg.com/imagetools/jfs/t1/137646/13/7132/1648/5f4c748bE43da8ddd/a3f06d51dcae7b60.png"
-      ></nut-icon>
       <van-button round block type="primary" native-type="submit"> 提交 </van-button>
     </div>
   </van-form>