xdd

src/views/store/components/productOrder.vue

@@ -81,31 +81,6 @@
             <el-descriptions-item label="订单类型"  >
               <el-tag prop="orderType" v-for="(item, index) in orderTypeOptions"    v-if="order!=null&&order.orderType==item.dictValue">{{item.dictLabel}}</el-tag>
             </el-descriptions-item>
-<!--            <el-descriptions-item label="物流公司编号"  >-->
-<!--                <span v-if="order!=null">-->
-<!--                  {{order.deliverySn}}-->
-<!--                </span>-->
-<!--            </el-descriptions-item>-->
-<!--            <el-descriptions-item label="物流公司名称"  >-->
-<!--                <span v-if="order!=null">-->
-<!--                  {{order.deliveryName}}-->
-<!--                </span>-->
-<!--            </el-descriptions-item>-->
-<!--            <el-descriptions-item label="物流单号"  >-->
-<!--                <span v-if="order!=null">-->
-<!--                  {{order.deliveryId}}-->
-<!--                </span>-->
-<!--            </el-descriptions-item>-->
-<!--            <el-descriptions-item label="物流状态"  >-->
-<!--                <span v-if="order!=null">-->
-<!--                  <el-tag prop="deliveryId" v-for="(item, index) in deliveryStatusOptions"    v-if="order!=null&&order.deliveryStatus==item.dictValue">{{item.dictLabel}}</el-tag>-->
-<!--                </span>-->
-<!--            </el-descriptions-item>-->
-<!--            <el-descriptions-item label="物流跟踪状态"  >-->
-<!--                <span v-if="order!=null">-->
-<!--                  <el-tag prop="deliveryId" v-for="(item, index) in deliveryTypeOptions"    v-if="order!=null&&order.deliveryType==item.dictValue">{{item.dictLabel}}</el-tag>-->
-<!--                </span>-->
-<!--            </el-descriptions-item>-->
             <el-descriptions-item label="物流结算费用"  >
                 <span v-if="order!=null&&order.deliveryPayMoney!=null ">
                   {{order.deliveryPayMoney.toFixed(2) }}
@@ -650,7 +625,7 @@ export default {
     this.getDicts("store_order_type").then((response) => {
       this.orderTypeOptions = response.data;
     });
-    this.getDicts("store_order_status").then((response) => {
+    this.getDicts("live_order_status").then((response) => {
       this.statusOptions = response.data;
     });
     this.getDicts("store_pay_type").then((response) => {

src/views/store/storeOrder/index.vue

@@ -237,18 +237,6 @@
               <span>{{scope.row.realName}} </span>
           </template>
       </el-table-column>
-      <!-- <el-table-column label="商品" align="center" width="300px" >
-          <template slot-scope="scope">
-              <div  v-for="(item, index) in scope.row.items" class="items"  >
-                <img class="pic" :src="JSON.parse(item.jsonInfo).image" />
-                <div class="goods-content">
-                  <div class="goods-title">{{ JSON.parse(item.jsonInfo).productName}}</div>
-                  <div class="sku">{{ JSON.parse(item.jsonInfo).sku}}</div>
-                  <div class="price">￥{{JSON.parse(item.jsonInfo).price}}×{{item.num}}</div>
-                </div>
-              </div>
-          </template>
-      </el-table-column> -->
       <el-table-column label="订单金额" align="center" prop="totalPrice" >
           <template slot-scope="scope">
               <span v-if="scope.row.totalPrice!=null">{{scope.row.totalPrice.toFixed(2)}}</span>
@@ -260,7 +248,6 @@
           </template>
       </el-table-column>
       <el-table-column label="下单时间" align="center" prop="createTime" />
-      <!-- <el-table-column label="支付状态" align="center" prop="paid" /> -->
       <el-table-column label="支付时间" align="center" prop="payTime" width="180">
       </el-table-column>
       <el-table-column label="支付方式" align="center" prop="payType" >