Merge branch 'master' of gitea.intra.yunpaper.com:zhangqi/kuailelunwen_new_houtai into zq-orderListTwo-0813

src/views/agent/home.vue

@@ -65,7 +65,7 @@
                   <img :src="require(`@/assets/home/service_classification_${classify_id}.png`)" alt="">
                   <b>{{ classifyId2Name[classify_id] }}</b>
                 </div>
-                <a href="/agent/supplyList" class="supplyPric-item-detail" target="_blank">详情</a>
+                <a href="#" @click="lookSupplyPrice(classify_id)" class="supplyPric-item-detail" target="_blank">详情</a>
               </div>
               <div class="list-wrap" style="overflow: auto;height:410px">
                 <div v-for="verid in vers" :key="verid" class="item-list homeFont">
@@ -354,6 +354,12 @@ export default {
       // 系统通知 -查看更多
         this.$router.push('/agent/noticeList')
     },
+    lookSupplyPrice(classify_id) {
+      window.open(this.$router.resolve({
+          path: '/agent/supplyList',
+          hash: '#section_'+classify_id
+      }).href, '_blank');
+    },
     lookAllSales() {
       // 销售统计 -查看全部
     },

src/views/agent/siteAddChooseService.vue

@@ -37,7 +37,7 @@
                             <span>{{ type2name[type] }}</span>
                             <input type="checkbox" :id="`item-${type}`" :checked="addlist[activeVerid].includes(type)"/>
                         </div>
-                        <p class="service-desc-item">{{ supplyPriceList[type].introduce }}</p>
+                        <p class="service-desc-item">{{ type2info[type].introduce }}</p>
                         <p class="service-price-item"><i>¥</i><span>{{ supplyPriceList[type].price }}</span> / {{ supplyPriceList[type].unit_format }}</p>
                     </li>
                 </ul>

src/views/agent/supplyList.vue

@@ -3,7 +3,7 @@
 
         <PromptText text='平台针对不同品牌产品，已做了风险提醒义务，请安全规避销售。平台仅保障货品正版，针对有风险的产品，请具备安全销售方案后再开展销售。' :type="3" />
 
-        <div class="supply-list" v-for="(vers, classify_id) in classifyId2Vers" :key="classify_id">
+        <div class="supply-list" v-for="(vers, classify_id) in classifyId2Vers" :key="classify_id" :id="'section_'+classify_id">
             <div class="classify-title mr-20">{{ classifyId2Name[classify_id] }}</div>
             <div class="classify">
                 <div class="ver-anchor-point flex" v-for="verid in vers" :key="verid">
@@ -91,6 +91,14 @@ export default {
         store.commit('SET_PAGETITLE', '基本设置');
 
         this.getSupplyServiceList();
+        if (this.$route.hash) {
+            setTimeout(() => {
+                const el = document.querySelector(this.$route.hash)
+                if (el) {
+                    el.scrollIntoView({ behavior: 'smooth', block: 'start' })
+                }
+            }, 500)
+        }
     },
     methods: {
         scrollToAnchor(ver) {
@@ -102,23 +110,23 @@ export default {
             });
         },
         getSupplyServiceList() {
-        this.$http('POST', '/agentnew/ajax_get_supply_services', {
-
-        }).then(response => {
-            this.$nextTick(() => {
-                this.classifyId2Name = response.data.classifyid2name;
-                this.classifyId2Vers = response.data.classifyid2vers;
-                this.ver2types = response.data.ver2types;
-                this.ver2info = response.data.ver2info;
-                this.type2name = response.data.type2name;
-                this.type2info = response.data.type2info;
-                this.supplyPriceList = response.data.supply_price;
-                this.salePolicy = response.data.sale_policy;
+            this.$http('POST', '/agentnew/ajax_get_supply_services', {
+
+            }).then(response => {
+                this.$nextTick(() => {
+                    this.classifyId2Name = response.data.classifyid2name;
+                    this.classifyId2Vers = response.data.classifyid2vers;
+                    this.ver2types = response.data.ver2types;
+                    this.ver2info = response.data.ver2info;
+                    this.type2name = response.data.type2name;
+                    this.type2info = response.data.type2info;
+                    this.supplyPriceList = response.data.supply_price;
+                    this.salePolicy = response.data.sale_policy;
+                })
+            }).catch(error => {
+                console.error(error, 'error')
             })
-        }).catch(error => {
-            console.error(error, 'error')
-        })
-    },
+        },
     }    
 }
 </script>