店铺类型修改

src/views/goods/order-detail.vue

@@ -15,28 +15,28 @@
               <span>{{storeType == 1 ? '物流' : '配送'}}信息</span>
             </div>
             <div v-if="showStatus == 1 || showStatus == 2">
-              <div v-if="storeType == 2">
+              <div v-if="storeType == 3">
                 <p>无配送信息，买家自提</p>
               </div>
               <div v-else>
                 <p class="trade-status1">
                   <i class="el-icon-truck" style="font-size: 18px"></i>
                   <span class="send-status" v-if="storeType == 1">已发货</span>
-                  <span class="send-status" v-if="storeType == 3">云鹊配送中</span>
+                  <span class="send-status" v-if="storeType == 2">云鹊配送中</span>
                 </p>
                 <p>收货地址：{{orderDetailData.receiverAddr}}，{{orderDetailData.receiver}}，{{orderDetailData.receiverMobile}}</p>
                 <div v-if="storeType == 1">
                   <p>物流公司：{{orderDetailData.expressName}}</p>
                   <p>快递单号：{{orderDetailData.expressNo}}</p>
                 </div>
-                <div v-if="storeType == 3">
+                <div v-if="storeType == 2">
                   <p>配送员姓名：{{orderDetailData.sender}}</p>
                   <p>手机号：{{orderDetailData.senderMobile}}</p>
                 </div>
                 <p>备注：{{orderDetailData.remark}}</p>
               </div>
             </div>
-            <div v-if="(showStatus == 3) && (storeType == 1 || storeType == 3)">
+            <div v-if="(showStatus == 3) && (storeType == 1 || storeType == 2)">
               <div class="trade-status1">
                 <p>
                   <i class="el-icon-truck" style="font-size: 18px"></i>
@@ -124,7 +124,7 @@
         storeId: null,
         orderId: null,
         showStatus: null,//订单展示状态,1已完成,2已发货,3待发货,4待支付,5交易关闭
-        storeType: null,//店铺类型，1供应商，2医生小店，3小药房
+        storeType: null,//店铺类型，1供应商，2小药房，3医生小店
         orderDetailData: {
           amount: '',//订单实付总金额
           createdTime: '',//下单时间

src/views/goods/order-manage.vue

@@ -86,9 +86,9 @@
               <!--<el-button @click="closeTrade(scope.row)" type="text" size="small">关闭交易</el-button>-->
               <!--<el-button @click="changePrice(scope.row)" type="text" size="small">修改价格</el-button>-->
               <el-button v-if="scope.row.storeType == 1 && scope.row.showStatus == 3" @click="sendGoods(scope.row)" type="text" size="small">发货</el-button>
-              <el-button v-if="scope.row.storeType == 3 && scope.row.showStatus == 3" @click="distribute(scope.row)" type="text" size="small">配送</el-button>
+              <el-button v-if="scope.row.storeType == 2 && scope.row.showStatus == 3" @click="distribute(scope.row)" type="text" size="small">配送</el-button>
               <el-button v-if="scope.row.storeType == 1 && (scope.row.showStatus == 1 || scope.row.showStatus == 2)" @click="viewLogistics(scope.row)" type="text" size="small">查看物流</el-button>
-              <el-button v-if="scope.row.storeType == 3 && scope.row.showStatus == 2" @click="distributeComplete(scope.row)" type="text" size="small">配送完成</el-button>
+              <el-button v-if="scope.row.storeType == 2 && scope.row.showStatus == 2" @click="distributeComplete(scope.row)" type="text" size="small">配送完成</el-button>
               <el-button @click="goDetail(scope.row)" type="text" size="small">查看详情</el-button>
             </div>
           </template>
@@ -221,8 +221,6 @@
         curmbFirst: '云鹊店铺',
         curmbSecond: '订单管理',
         activeName: 'all',
-        showAllFlag: false,
-        showNewFlag: false,
         searchForm: {
           showStatus: -1,
           storeId: 0,
@@ -244,16 +242,6 @@
           //   createdTime: '',
           // }
         ],
-        typeList: [{
-          label: '供货商',
-          value: '1',
-        }, {
-          label: '医生小店',
-          value: '2',
-        }, {
-          label: '小药房',
-          value: '3',
-        }],
         closeTradeDialog: false,
         reasonTxt: '',
         changePriceDialog: false,
@@ -288,21 +276,6 @@
           if (res.code == '000000') {
             this.tableData = res.data.orderSingleDtoList;
             this.totalRows = res.data.totalNum;
-            /*let item = {
-              id: 123,
-              goodsName: [
-                {
-                  name: '阿莫西林',
-                },
-                {
-                  name: '不知道什么鬼',
-                },
-                {
-                  name: '啊咧',
-                }
-              ],
-            }
-            this.tableData.push(item);*/
           }
         })
       },

src/views/shop/create-shop.vue

@@ -17,6 +17,7 @@
             label-width="150px"
             label-suffix="："
             class="basic-form"
+            style="margin-top: 15px"
         >
           <div class="basic-item-icon">
             <el-form-item label="店铺LOGO" class="required-label">
@@ -254,7 +255,7 @@
               </div>
             </el-form-item>
           </div>
-          <div v-if="formData.storeType == 2">
+          <div v-if="formData.storeType == 3">
             <el-col :span="10">
               <el-form-item label="医生姓名" prop="docName" class="required-label">
                 <el-input
@@ -283,7 +284,7 @@
               </el-form-item>
             </el-col>
           </div>
-          <div v-if="formData.storeType == 3">
+          <div v-if="formData.storeType == 2">
             <el-col :span="10">
               <el-form-item label="入驻药店名称" prop="drugstoreName" class="required-label">
                 <el-input
@@ -448,16 +449,16 @@
         storeData: {},
         typeList: [
           {
-          label: '供货商',
-          value: 1,
-        }, {
-          label: '医生小店',
-          value: 2,
-        }, {
-          label: '小药房',
-          value: 3,
-        }
-        ],
+            label: '供货商',
+            value: 1,
+          }, {
+            label: '小药房',
+            value: 2,
+          }, {
+            label: '医生小店',
+            value: 3,
+          }
+          ],
         formData: {
           storeId: null,
           userId: null,
@@ -595,13 +596,7 @@
         enterType: 1,
       }
     },
-    watch: {
-      'formData.adminList':  function(val) {
-        val.map((item,index) => {
-
-        })
-      },
-    },
+    watch: {},
     created() {
       vm = this;
       this.formData.storeId = this.$route.query.storeId || null;
@@ -659,10 +654,10 @@
               id: null,
             }]
           }
-        }else if (storeType == 2) {
+        }else if (storeType == 3) {
           this.formData.docName = storeOwner;
           this.formData.docPhone = storePhone;
-        }else if (storeType == 3) {
+        }else if (storeType == 2) {
           this.formData.drugstoreName = storeOwner;
           this.formData.drugstorePhone = storePhone;
           if (this.storeData.imageList && this.storeData.imageList.length) {
@@ -748,11 +743,11 @@
             this.supplierImg3.imageUrl = this.formData.imgUrlP3;
             this.formData.imageList.push(this.supplierImg3);
           }
-        }else if (type == 2) {
+        }else if (type == 3) {
           this.formData.storeOwner = this.formData.docName;
           this.formData.storePhone = this.formData.docPhone;
           this.formData.adminList = [];
-        }else if (type == 3) {
+        }else if (type == 2) {
           this.formData.storeOwner = this.formData.drugstoreName;
           this.formData.storePhone = this.formData.drugstorePhone;
           this.formData.adminList = [];
@@ -806,7 +801,7 @@
 
           flag = true;
         }
-        if (this.formData.storeType == 2) {
+        if (this.formData.storeType == 3) {
           if (!this.formData.docName) {
             this.$message.warning('请输入医生姓名');
             return;
@@ -822,7 +817,7 @@
           }
           flag = true;
         }
-        if (this.formData.storeType == 3) {
+        if (this.formData.storeType == 2) {
           if (!this.formData.drugstoreName) {
             this.$message.warning('请输入入驻药店名称');
             return;

src/views/shop/shop-list.vue

@@ -137,10 +137,10 @@
           label: '供货商',
           value: 1,
         }, {
-          label: '医生小店',
+          label: '小药房',
           value: 2,
         }, {
-          label: '小药房',
+          label: '医生小店',
           value: 3,
         }]
       }
@@ -246,8 +246,8 @@
         } else {
           let hash = {
             1: "供货商",
-            2: "医生小店",
-            3: "小药房"
+            2: "小药房",
+            3: "医生小店"
           };
           return hash[value];
         }