提交

src/views/modules/order/buyorder.vue

@@ -6,6 +6,7 @@
       <el-tab-pane label="电子书" name="1"> </el-tab-pane>
       <el-tab-pane label="充值订单" name="2"></el-tab-pane>
     </el-tabs> -->
+   
     <el-radio-group size="mini" v-model="tabChange.tabActiveName" style="margin-bottom: 10px;">
       <el-radio-button label="">全部</el-radio-button>
       <el-radio-button label="0">待付款</el-radio-button>
@@ -69,6 +70,7 @@
           </el-date-picker>
         </div>
       </el-form-item>
+   
       <el-form-item>
         <div class="block">
           <el-checkbox size="mini"
@@ -245,6 +247,21 @@
                     <div v-if="fitem.paymentMethod == 4"><img src="../../../../static/img/oder_chong.png" width="22px"
                         height="22px">天医币支付</div>
                   </div>
+                  <div>
+                   
+          <span v-if="fitem.user.vip==1">
+            <img style="width: 20px;height: 20px;" src="../../../assets/img/vip.png" alt="">
+            <el-tag size="mini"  type="warning" style="font-weight: bold;"  effect="dark">超级VIP</el-tag>
+          </span>
+          <span v-if="fitem.user.vip==2">
+            <img style="width: 20px;height: 20px;" src="../../../assets/img/wumen.png" alt="">
+            <el-tag size="mini"  style="font-weight: bold;">吴门医述</el-tag>
+          </span>
+          <span v-if="fitem.user.vip==3">
+            <img style="width: 20px;height: 20px;" src="../../../assets/img/zm.png" alt="">
+            <el-tag size="mini"  type="success" style="font-weight: bold;" >众秒之门</el-tag>
+          </span>
+                  </div>
                 </div>
                 <div class="buier td3 xcenter">
                   <div class="tabName">收货信息：
@@ -316,8 +333,29 @@
       </el-table-column> -->
       <el-table-column prop="orderSn" header-align="center" align="center" label="订单编号" width="150">
       </el-table-column>
-      <!-- <el-table-column prop="userName" header-align="center" align="center" label="下单人姓名">
-      </el-table-column> -->
+      <el-table-column prop="userName" header-align="center" align="center" label="VIP" width="80">
+        <template slot-scope="scope">
+          <span v-if="scope.row.user.vip==0">-</span>
+
+          <span v-if="scope.row.user.vip==1">
+            <img style="width: 25px;height: 25px;" src="../../../assets/img/vip.png" alt="">
+            <el-tag size="mini"  type="warning" style="font-weight: bold;"  effect="dark">超级VIP</el-tag>
+          </span>
+          <span v-if="scope.row.user.vip==2">
+            <img style="width: 25px;height: 25px;" src="../../../assets/img/wumen.png" alt="">
+            <el-tag size="mini"  style="font-weight: bold;">吴门医述</el-tag>
+          </span>
+          <span v-if="scope.row.user.vip==3">
+            <img style="width: 25px;height: 25px;" src="../../../assets/img/zm.png" alt="">
+            <el-tag size="mini"  type="success" style="font-weight: bold;" >众秒之门</el-tag>
+          </span>
+          
+          
+         
+          
+          
+        </template>
+      </el-table-column>
       <el-table-column prop="shippingUser" header-align="center" align="center" label="收货人信息">
         <template slot-scope="scope">
           <span
@@ -357,7 +395,7 @@
             align="center"
             label="地址">
           </el-table-column> -->
-      <el-table-column prop="paymentMethod" header-align="center" align="center" label="支付方式" width="130">
+      <el-table-column prop="paymentMethod" header-align="center" align="center" label="支付方式" width="100">
         <template slot-scope="scope">
           <el-tag size="mini" v-if="scope.row.paymentMethod == 1" type="success">微信</el-tag>
           <el-tag size="mini" v-if="scope.row.paymentMethod == 2" type="primary">支付宝</el-tag>
@@ -392,7 +430,7 @@
       </el-table-column> -->
       <el-table-column prop="createTime" header-align="center" align="center" label="下单时间">
       </el-table-column>
-      <el-table-column prop="productList" header-align="center" align="center" label="下单商品" width="500">
+      <el-table-column prop="productList" header-align="center" align="center" label="下单商品" width="450">
         <template slot-scope="scope">
           <!-- {{scope.row.goodsList}} -->
           <div v-for="(item, index) in scope.row.productList" :key="index">
@@ -1336,6 +1374,7 @@ this.pageIndex = 1
     watch: {
       tabChange: {
         handler(val, oldVal) {
+          this.dataForm.filterPresale=false
           //console.log(val)
           this.getDataList()
           if (this.tabChange.tabActiveName === '' || this.tabChange.tabActiveName === '0' || this.tabChange

src/views/modules/order/buyorderdetail.vue

@@ -49,6 +49,7 @@
             <span>IOS内购</span>
           </span>
         </li>
+       
         <li style="width: 100%;" v-if="orderDetails.paymentMethod == 2&&orderDetails.orderStatus > 0">
           <span class="infoTitle">商家订单号：</span>
           <span>{{orderDetails.outTradeNo}}</span>