修改bug

src/App.vue

@@ -31,14 +31,13 @@ export default {
                 }
             },
         });
-                // 登录处理
-        await self.fn.login(option);
 
     },
 
     onShow: async function (option) {
         const self = this;
-
+        // 登录处理
+        await self.fn.login(option);
     },
 
     onHide: function () {

src/pages/recommend/detail.vue

@@ -7,6 +7,7 @@
             :refresher-enabled="true"
             :refresher-triggered="triggered"
             @refresherrefresh="refresherrefresh"
+            @scrolltolower="getMoreGoods"
             :scroll-into-view="scroll"
         >
             <swiper
@@ -16,11 +17,34 @@
             >
                 <swiper-item
                     class="swiper__item"
-                    v-for="(item, index) in goods.pictureUrls"
-                    :key="index"
+                    v-if="goods.videos.orgVideoUrl"
                 >
-                    <my-image class="swiper__img" :src="item"></my-image>
+                    <video
+                        id="goodVideo"
+                        class="swiper__video"
+                        :src="goods.videos.orgVideoUrl"
+                        :poster="goods.videos.orgCoverUrl"
+                        :show-mute-btn="true"
+                    ></video>
                 </swiper-item>
+                <block v-if="goods.detailUrlList && goods.detailUrlList.length">
+                    <swiper-item
+                        class="swiper__item"
+                        v-for="(item, index) in goods.detailUrlList"
+                        :key="index"
+                    >
+                        <my-image class="swiper__img" :src="item"></my-image>
+                    </swiper-item>
+                </block>
+                <block v-else>
+                    <swiper-item
+                        class="swiper__item"
+                        v-for="(item, index) in goods.pictureUrls"
+                        :key="index"
+                    >
+                        <my-image class="swiper__img" :src="item"></my-image>
+                    </swiper-item>
+                </block>
             </swiper>
             <div class="info">
                 <div class="info__top">
@@ -202,7 +226,20 @@
                 </li>
             </ul>
 
-            <div class="images">
+            <div
+                class="images"
+                v-if="goods.detailUrlList && goods.detailUrlList.length"
+            >
+                <my-image
+                    class="images__item"
+                    mode="widthFix"
+                    :src="item"
+                    v-for="(item, index) in goods.detailUrlList"
+                    :key="index"
+                ></my-image>
+            </div>
+
+            <div class="images" v-else>
                 <my-image
                     class="images__item"
                     mode="widthFix"
@@ -272,9 +309,9 @@
                                 class="goods__present"
                                 @click="jumpGoodsDetail(item)"
                             >
-                                <span class="goods__big">¥{{
-                                    item.minPrice / 100
-                                }}</span>
+                                <span class="goods__big"
+                                    >¥{{ item.minPrice / 100 }}</span
+                                >
                             </div>
                             <div
                                 class="goods__original"
@@ -286,7 +323,16 @@
                         </div>
                     </li>
                 </ul>
-                <div class="more-text" v-if="goodsList.length && !isHaveMore">
+                <div
+                    class="more-text"
+                    v-if="goodsList.length && !isHaveMore && goodListLoading"
+                >
+                    - 加载中 -
+                </div>
+                <div
+                    class="more-text"
+                    v-if="goodsList.length && !isHaveMore && !goodListLoading"
+                >
                     - 没有更多了 -
                 </div>
                 <div class="null" v-if="loading && !goodsList.length">
@@ -452,13 +498,15 @@ export default {
             goodsList: [],
             loading: false,
             isHaveMore: false,
+            goodListLoading: true,
         };
     },
 
     async onShow() {
         const self = this;
-
+        console.log(1122);
         await self.fn.init();
+        console.log("after");
 
         this.deliveryConfig = this.$store.state.common.storeConfig.deliveryConfig;
         self.fn.shareMenu();
@@ -529,7 +577,7 @@ export default {
                         console.log(self.goods);
                         self.creationShare2();
                         self.getGoodsList();
-                        if(data.skuList && data.skuList.length ===1){
+                        if (data.skuList && data.skuList.length === 1) {
                             self.spec = data.skuList[0];
                             self.spec.active = true;
                         }
@@ -1123,6 +1171,7 @@ export default {
             uni.showLoading({
                 title: "加载中...",
             });
+            this.goodListLoading = true;
             self.api
                 .get("/Product/GetRelevant", {
                     keyword: self.goods.name,
@@ -1130,6 +1179,7 @@ export default {
                     pageSize: 20,
                 })
                 .then((res) => {
+                    this.goodListLoading = false;
                     uni.hideLoading();
                     uni.stopPullDownRefresh();
                     let data = JSON.parse(res.data.list);
@@ -1148,7 +1198,7 @@ export default {
         // 获取更多商品
         getMoreGoods() {
             const self = this;
-
+            this.goodListLoading = true;
             self.api
                 .get("/Product/GetRelevant", {
                     keyword: self.goods.name,
@@ -1156,6 +1206,7 @@ export default {
                     pageSize: 20,
                 })
                 .then((res) => {
+                    this.goodListLoading = false;
                     let data = JSON.parse(res.data.list);
                     if (data.length) {
                         self.page++;
@@ -2169,11 +2220,11 @@ page {
     font-size: px(34);
     color: #999;
 }
-.bg-white{
+.bg-white {
     background-color: #fff;
     margin-top: px(30);
 }
-.everybody{
+.everybody {
     text-align: center;
     padding: px(30);
     font-size: px(44);

src/pages/user/index.vue

@@ -279,7 +279,7 @@
         </div>
 
         <div class="web-support">
-            <p class="text">0.0.93</p>
+            <p class="text">0.0.94</p>
             <!-- <div class="num" @click="makeCall">400-629-6782</div> -->
         </div>
     </div>