edit

src/assets/css/_themes.scss

@@ -32,6 +32,7 @@ $themes: (active1: ( //边框
         //宽度
         wd_centerBtnLi_img:calc(80% - 0px),
         wd_second_img:80%,
+        wd_product_con: calc(70% - 5px),
         //padding
         pd_paddy_top: 17px 19px 0px,
         //背景图大小
@@ -112,6 +113,7 @@ $themes: (active1: ( //边框
         //宽度
         wd_centerBtnLi_img:calc(100% - 60px),
         wd_second_img:90%,
+        wd_product_con: calc(50% - 5px),
         //padding
         pd_paddy_top: 10px 16px 0px,
         //背景图大小

src/views/order/detail.vue

@@ -63,6 +63,7 @@ export default {
   },
   data() {
     return {
+      type:null,
       id: "0",
       status: "0",
       list1: [
@@ -81,17 +82,34 @@ export default {
         { title: "收货地址：", value: "" },
       ],
       list4: [
-        { title: "商品名称：", value: "五常大米" },
-        { title: "购买数量：", value: "" },
+       { title: "商品名称：", value: "五常大米" },
+          { title: "购买数量：", value: "" },
       ],
       loading: false,
     };
   },
   async created() {
+    this.type = this.$store.getters.type;
+    // this.typeActive(this.type);
+
     this.id = this.$route.query.id ? this.$route.query.id : "0";
     await this.initData();
   },
   methods: {
+    typeActive(type){
+      // if(type == "active1"){
+      //   this.list4 = [
+      //     { title: "商品名称：", value: "五常大米" },
+      //     { title: "购买数量：", value: "" },
+      //     { title: "规格：", value: "" },
+      //   ]
+      // }else{
+      //   this.list4 = [
+      //     { title: "商品名称：", value: "五常大米" },
+      //     { title: "购买数量：", value: "" },
+      //   ]
+      // }
+    },
     onClickLeft() {
       window.history.back(-1);
     },
@@ -116,12 +134,21 @@ export default {
           addr,
           unit_weight,
           good_name,
+          good_desc,
         } = res.data;
         this.list1[0].value = order_sn;
         this.list1[1].value = status === "1" ? "待发货" : "待收货";
         this.status = status;
-        this.list4[0].value = good_name;
-        this.list4[1].value = order_num + unit+"/"+unit_weight+'kg';
+
+
+        //主题判断
+        if(this.type == "active1"){
+          this.list4[0].value = good_name;
+          this.list4[1].value = order_num + unit+"/" + good_desc;
+        }else{
+           this.list4[0].value = good_name;
+          this.list4[1].value = order_num + unit+"/"+unit_weight+'kg';
+        }
         this.list1[2].value = order_time;
         if (this.status === "2") {
           this.list2[0].value = post_name;

src/views/order/index.vue

@@ -48,12 +48,22 @@
           </li>
           <li>
             <span class="fl">{{ item.name }}</span>
-            <span class="fr"
+
+            <span class="fr" v-if="type == 'active1'"
+              >{{ item.order_num }}{{ item.unit }} </span
+            >
+            <span class="fr" v-if="type == 'active2'"
               >{{ item.order_num }}{{ item.unit }}/{{
                 item.unit_weight
               }}kg</span
             >
+            
           </li>
+          <!-- <li v-if="type == 'active1'">
+            商品规格：
+            <span class="fr" >{{ item.good_desc }}</span>
+            
+          </li> -->
         </ul>
       </div>
     </van-list>
@@ -75,6 +85,7 @@ export default {
   },
   data() {
     return {
+      type:null,
       active: "0",
       tabList: [
         {
@@ -102,6 +113,8 @@ export default {
     };
   },
   async created() {
+    this.type = this.$store.getters.type;
+
     this.parmValue.status = this.$route.query.type
       ? this.$route.query.type
       : "0";

src/views/product/index.vue

@@ -21,11 +21,8 @@
           <div class="box" :class="{ selected: item.id == radioV }">
             <img :src="item.img" alt="" />
             <p>{{ item.name }}</p>
-            <span
-              >可用库存:{{ item.stock }}{{ item.unit }}/{{
-                item.weight
-              }}kg</span
-            >
+            <span>库存:{{ item.stock }}{{ item.unit }}</span>
+            <span style="margin-left:0px; float:right;" v-if="type == 'active1'">{{ item.good_desc}}</span>
           </div>
         </li>
       </ul>
@@ -48,8 +45,7 @@
     </div>
     <div class="product-footer clear">
       <div class="fl">
-       
-        <input-number :numb="num" :max="stock"  @backNum="backNum" />
+        <input-number :numb="num" :max="stock" @backNum="backNum" />
       </div>
       <div>
         <van-button type="info" class="fr" @click="placeOrder"
@@ -69,6 +65,8 @@ export default {
   mixins: [resToken],
   data() {
     return {
+      type:null,
+
       addrAdd: require("@/assets/images/active1/product/add.png"), //用户头像
       bgImg: require("@/assets/images/active1/product/bgImg.png"), //用户头像
       tags: require("@/assets/images/active1/product/tags.png"), //用户头像
@@ -89,6 +87,10 @@ export default {
       isce: "",
     };
   },
+  created(){
+    this.type = this.$store.getters.type;
+
+  },
   mounted() {
     this.ad = getAd() ? JSON.parse(getAd()) : {};
     this.num = isNaN(getGoodsNum()) ? 0 : parseInt(getGoodsNum());
@@ -110,7 +112,6 @@ export default {
       }
     },
     async getaddress() {
-      
       let numRes = await this.set_user_goodsNum(this.num);
       let unitRes = await this.set_user_goodsUnit(this.radioV);
       if (numRes && numRes.code === 0 && unitRes && unitRes.code === 0) {
@@ -132,8 +133,8 @@ export default {
           }
           this.canStockBag = res.data.stock;
           this.canStockBox = res.data.stock;
-          
-          console.log(limit)
+
+          console.log(limit);
           this.distributeGoods(limit);
           // await this.getUnitist(limit);
           this.total = parseInt(stock + "");
@@ -169,6 +170,7 @@ export default {
 
             stock: parseInt(v1.limit_num + ""),
             weight: v1.weight,
+            good_desc:v1.good_desc,
             unit: v1.name,
           };
           this.productList.push(item);
@@ -266,7 +268,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
- @import "../../assets/css/_handle.scss";
+@import "../../assets/css/_handle.scss";
 
 .product {
   @include background("bd_product");
@@ -333,14 +335,16 @@ export default {
   .productPack {
     width: 100%;
     // .packageBox {
-      // display: flex;
-      // justify-content: space-between;
+    // display: flex;
+    // justify-content: space-between;
     // }
 
     li {
       list-style: none;
       float: right;
-      width: calc(50% - 5px);
+      // width: calc(50% - 5px);
+      
+      @include wd("wd_product_con");
       // display: inline-block;
       // padding: 5px;
       &:last-child {
@@ -348,7 +352,7 @@ export default {
       }
       .box {
         background: #e6e6dc;
-  // @include background("bd_product_packbox");
+        // @include background("bd_product_packbox");
 
         border-radius: 13px;
         padding: 5px 5px 10px 5px;
@@ -438,7 +442,7 @@ export default {
     position: fixed;
     width: 100%;
     // background: #e6e6dc;
-  @include background("bd_product_footer");
+    @include background("bd_product_footer");
 
     left: 0;
     bottom: 50px;
@@ -451,8 +455,8 @@ export default {
     }
     button {
       // background: #e6e6dc;
-  @include background("bd_product_footerBtn");
-  @include font_color("font_product_footerBtn");
+      @include background("bd_product_footerBtn");
+      @include font_color("font_product_footerBtn");
 
       color: #292929;
       padding: 0;