Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui

buyer/src/pages/shopEntry/ShopEntry.vue

@@ -26,7 +26,7 @@
       <Button type="primary" @click='currentIndex = 0'
         v-if="storeDisable === 'REFUSED' && currentIndex === 3">重新申请</Button>
     </div>
- 
+
     <Modal title="店铺入驻协议" v-model="showAgreement" width="1200" :closable="false" :mask-closable="false">
       <Scroll :on-reach-bottom="handleReachBottom">
         <div class="agreeent-con" v-html="agreementCon"></div>
@@ -42,6 +42,7 @@
   </div>
 </template>
 <script>
+
 import { agreement, applyStatus } from "@/api/shopentry";
 import firstApply from "./FirstApply";
 import secondApply from "./SecondApply";
@@ -152,8 +153,11 @@ export default {
     },
   },
   mounted() {
-    this.getData("init");
+
-    this.getArticle();
+      this.getData("init");
+      this.getArticle();
+
+
   },
 };
 </script>
@@ -180,7 +184,7 @@ export default {
   max-height: 500px;
   ::v-deep img{
     max-width: 100%;
-    max-height: 200px;
+
   }
 }
 .success-page {

im/vue.config.js

@@ -12,16 +12,11 @@ function resolve(dir) {
 const assetsCDN = {
   externals: {
     vue: 'Vue',
-    'vue-router': 'VueRouter',
+
-    vuex: 'Vuex',
-    axios: 'axios',
   },
   css: [],
   js: [
-    'https://unpkg.com/vue@2.6.11/dist/vue.min.js',
+    'https://cdn.pickmall.cn/cdn/vue.min.js',
-    'https://unpkg.com/vue-router@3.4.9/dist/vue-router.min.js',
-    'https://unpkg.com/vuex@3.5.1/dist/vuex.min.js',
-    'https://unpkg.com/axios@0.21.0/dist/axios.min.js',
   ],
 }
 

seller/src/views/shop/modelList/notEnough.vue

@@ -16,7 +16,7 @@
                 <img :src="item.img" width="210" height="210" :alt="item.name">
                 <p>{{item.name}}</p>
                 <p>
-                    <span>{{item.price | unitPrice('￥')}}</span> 
+                    <span>{{item.price | unitPrice('￥')}}</span>
                     <!-- <span>{{item.price | unitPrice('￥')}}</span> -->
                 </p>
                 <div class="setup-box">
@@ -100,10 +100,10 @@ export default {
         },
         handleSelectGoods(item) { // 调起选择商品弹窗
             if(item) this.selected = item;
-            this.$refs.liliDialog.open('goods', 'single')
+            this.$refs.liliDialog.flag = true;
-            setTimeout(() => {
+            this.$refs.liliDialog.goodsFlag = true;
-                this.$refs.liliDialog.goodsData = [this.selected]
+            this.$refs.liliDialog.singleGoods();
-            }, 500);
+
         },
         // 选择商品回调
         selectedGoodsData(val){
@@ -175,16 +175,16 @@ export default {
             cursor: pointer;
         }
         border-right: 1px solid #eee;
-        
+
     }
     li:last-of-type{
         border: none;
     }
-   
+
     .curr{
         p:nth-child(1){
             background-color: $theme_color;
-            
+
             color: #fff;
         }
         p:nth-child(2){
@@ -223,4 +223,4 @@ export default {
         }
     }
 }
-</style>
+</style>