潘超林 3 months ago
parent
commit
60ea290118
3 changed files with 9885 additions and 9820 deletions
  1. 120 51
      src/views/manage/order.vue
  2. 0 4
      src/views/sortmanage/sort.vue
  3. 9765 9765
      yarn.lock

+ 120 - 51
src/views/manage/order.vue

@@ -119,7 +119,9 @@
               </div>
               </div>
               <div class="count">
               <div class="count">
                 {{
                 {{
-                  orderStatistics.divideWaitPrice ? orderStatistics.divideWaitPrice : 0
+                  orderStatistics.divideWaitPrice
+                    ? orderStatistics.divideWaitPrice
+                    : 0
                 }}元
                 }}元
               </div>
               </div>
             </div>
             </div>
@@ -192,8 +194,10 @@
           <el-option label="待付款" value="WAIT_PAY"> </el-option>
           <el-option label="待付款" value="WAIT_PAY"> </el-option>
           <el-option label="已完成" value="COMPLETE"> </el-option>
           <el-option label="已完成" value="COMPLETE"> </el-option>
           <el-option label="已取消/申请售后" value="CANCEL"> </el-option>
           <el-option label="已取消/申请售后" value="CANCEL"> </el-option>
-          <el-option label="待发布货运信息" value="WAIT_PUBLISH_INVOICE"> </el-option>
-          <el-option label="等待司机接单" value="WAIT_DRIVER_ERCEIVE"> </el-option>
+          <el-option label="待发布货运信息" value="WAIT_PUBLISH_INVOICE">
+          </el-option>
+          <el-option label="等待司机接单" value="WAIT_DRIVER_ERCEIVE">
+          </el-option>
         </el-select>
         </el-select>
       </el-form-item>
       </el-form-item>
       <el-form-item label="售后状态" prop="afterSaleStatus">
       <el-form-item label="售后状态" prop="afterSaleStatus">
@@ -223,7 +227,11 @@
           <el-option label="微信支付" value="wechat"> </el-option>
           <el-option label="微信支付" value="wechat"> </el-option>
         </el-select>
         </el-select>
       </el-form-item>
       </el-form-item>
-      <el-form-item label="配送方式" prop="deliveryType" style="margin-left: 60px">
+      <el-form-item
+        label="配送方式"
+        prop="deliveryType"
+        style="margin-left: 60px"
+      >
         <el-select
         <el-select
           v-model="queryParams.deliveryType"
           v-model="queryParams.deliveryType"
           placeholder="请选择支付方式"
           placeholder="请选择支付方式"
@@ -232,14 +240,21 @@
           <el-option label="全部" value=""> </el-option>
           <el-option label="全部" value=""> </el-option>
           <el-option label="自提" value="0"> </el-option>
           <el-option label="自提" value="0"> </el-option>
           <el-option label="同城下单" value="1"> </el-option>
           <el-option label="同城下单" value="1"> </el-option>
-          <el-option label="异地下单" value="2" v-if="activeName == 0"> </el-option>
+          <el-option label="异地下单" value="2" v-if="activeName == 0">
+          </el-option>
         </el-select>
         </el-select>
       </el-form-item>
       </el-form-item>
       <el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
           >搜索</el-button
           >搜索</el-button
         >
         >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
       </el-form-item>
     </el-form>
     </el-form>
 
 
@@ -289,9 +304,18 @@
         :show-overflow-tooltip="true"
         :show-overflow-tooltip="true"
       />
       />
 
 
-      <el-table-column label="商品名称" align="center" prop="skuName" width="200">
+      <el-table-column
+        label="商品名称"
+        align="center"
+        prop="skuName"
+        width="200"
+      >
         <template slot-scope="scope">
         <template slot-scope="scope">
-          {{ scope.row.goodsInfo ? JSON.parse(scope.row.goodsInfo)[0].skuName : "" }}
+          {{
+            scope.row.goodsInfo
+              ? JSON.parse(scope.row.goodsInfo)[0].skuName
+              : ""
+          }}
         </template>
         </template>
       </el-table-column>
       </el-table-column>
       <el-table-column
       <el-table-column
@@ -300,7 +324,9 @@
         prop="paymentAmount"
         prop="paymentAmount"
         width="100"
         width="100"
       >
       >
-        <template slot-scope="scope"> {{ scope.row.goodsAmount.toFixed(2) }}元 </template>
+        <template slot-scope="scope">
+          {{ scope.row.goodsAmount.toFixed(2) }}元
+        </template>
       </el-table-column>
       </el-table-column>
 
 
       <el-table-column
       <el-table-column
@@ -316,14 +342,31 @@
         width="110"
         width="110"
       />
       />
 
 
-      <el-table-column label="下单人姓名" align="center" prop="userNick" width="120" />
-      <el-table-column label="下单人ID" align="center" prop="userId" width="100" />
-      <el-table-column label="下单时间" align="center" prop="createTime" width="160" />
+      <el-table-column
+        label="下单人姓名"
+        align="center"
+        prop="userNick"
+        width="120"
+      />
+      <el-table-column
+        label="下单人ID"
+        align="center"
+        prop="userId"
+        width="100"
+      />
+      <el-table-column
+        label="下单时间"
+        align="center"
+        prop="createTime"
+        width="160"
+      />
       <el-table-column label="单价/数量" align="center" prop="price">
       <el-table-column label="单价/数量" align="center" prop="price">
         <template slot-scope="scope">
         <template slot-scope="scope">
           <span>
           <span>
             {{
             {{
-              scope.row.goodsInfo ? JSON.parse(scope.row.goodsInfo)[0].price + "元" : ""
+              scope.row.goodsInfo
+                ? JSON.parse(scope.row.goodsInfo)[0].price + "元"
+                : ""
             }}
             }}
             <br />
             <br />
             {{
             {{
@@ -364,7 +407,12 @@
           }}
           }}
         </template>
         </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="配送方式" align="center" prop="paymentType" width="120">
+      <el-table-column
+        label="配送方式"
+        align="center"
+        prop="paymentType"
+        width="120"
+      >
         <template slot-scope="scope">
         <template slot-scope="scope">
           {{
           {{
             scope.row.deliveryType == "0"
             scope.row.deliveryType == "0"
@@ -439,14 +487,20 @@
             size="mini"
             size="mini"
             type="text"
             type="text"
             @click="handlexyhf(scope.row)"
             @click="handlexyhf(scope.row)"
-            v-if="scope.row.paymentType == 'firstuse' && scope.row.auditFirstUse != 0"
+            v-if="
+              scope.row.paymentType == 'firstuse' &&
+              scope.row.auditFirstUse != 0
+            "
             >先用后付审核</el-button
             >先用后付审核</el-button
           >
           >
           <el-button
           <el-button
             size="mini"
             size="mini"
             type="text"
             type="text"
             @click="handlexxzf(scope.row)"
             @click="handlexxzf(scope.row)"
-            v-if="scope.row.paymentStatus == '2' && scope.row.confirmOfflinePayment != 0"
+            v-if="
+              scope.row.paymentStatus == '2' &&
+              scope.row.confirmOfflinePayment != 0
+            "
             >确认是否已线下支付</el-button
             >确认是否已线下支付</el-button
           >
           >
           <el-button
           <el-button
@@ -469,7 +523,12 @@
     />
     />
 
 
     <!-- 添加或修改参数配置对话框 -->
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1000px"
+      append-to-body
+    >
       <el-descriptions title="订单详情" column="3">
       <el-descriptions title="订单详情" column="3">
         <el-descriptions-item label="订单编号">{{
         <el-descriptions-item label="订单编号">{{
           detailInfo ? detailInfo.userOrderSn : ""
           detailInfo ? detailInfo.userOrderSn : ""
@@ -626,7 +685,8 @@
         </el-table-column>
         </el-table-column>
         <el-table-column prop="price" label="商品单价(元)"> </el-table-column>
         <el-table-column prop="price" label="商品单价(元)"> </el-table-column>
         <el-table-column prop="quantity" label="下单数量"> </el-table-column>
         <el-table-column prop="quantity" label="下单数量"> </el-table-column>
-        <el-table-column prop="totalPrice" label="总金额(元)"> </el-table-column>
+        <el-table-column prop="totalPrice" label="总金额(元)">
+        </el-table-column>
       </el-table>
       </el-table>
     </el-dialog>
     </el-dialog>
 
 
@@ -874,7 +934,10 @@ export default {
     },
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (columnIndex === 0 || columnIndex === 1) {
       if (columnIndex === 0 || columnIndex === 1) {
-        if (rowIndex === 0 || row.carPayNo != this.spuList[rowIndex - 1].carPayNo) {
+        if (
+          rowIndex === 0 ||
+          row.carPayNo != this.spuList[rowIndex - 1].carPayNo
+        ) {
           let rowspan = 0;
           let rowspan = 0;
           this.spuList.forEach((element) => {
           this.spuList.forEach((element) => {
             if (element.carPayNo === row.carPayNo) {
             if (element.carPayNo === row.carPayNo) {
@@ -936,46 +999,52 @@ export default {
     getList() {
     getList() {
       this.selectList = [];
       this.selectList = [];
       this.loading = true;
       this.loading = true;
-      queryUserOrderByShopId(this.addDateRange(this.queryParams, this.dateRange)).then(
-        (response) => {
-          if (response.code == 200) {
-            let list = response.data.records;
-            let infoList = [];
-            for (let index = 0; index < list.length; index++) {
-              let e = list[index];
-              if (e.dxUserOrderVOList) {
-                for (let i = 0; i < e.dxUserOrderVOList.length; i++) {
-                  let a = e.dxUserOrderVOList[i];
-                  let c = { ...e, ...a };
-                  infoList.push(c);
-                }
-              } else {
-                infoList.push(e);
+      queryUserOrderByShopId(
+        this.addDateRange(this.queryParams, this.dateRange)
+      ).then((response) => {
+        if (response.code == 200) {
+          let list = response.data.records;
+          let infoList = [];
+          for (let index = 0; index < list.length; index++) {
+            let e = list[index];
+            if (e.dxUserOrderVOList) {
+              for (let i = 0; i < e.dxUserOrderVOList.length; i++) {
+                let a = e.dxUserOrderVOList[i];
+                let c = { ...e, ...a };
+                infoList.push(c);
               }
               }
+            } else {
+              infoList.push(e);
             }
             }
-            let totalList = [];
-            for (let index = 0; index < infoList.length; index++) {
-              let e = infoList[index];
-              if (e.goodsInfo) {
+          }
+          let totalList = [];
+          for (let index = 0; index < infoList.length; index++) {
+            let e = infoList[index];
+            if (e.goodsInfo) {
+              try {
                 var goods = JSON.parse(e.goodsInfo);
                 var goods = JSON.parse(e.goodsInfo);
                 e = { ...e, ...goods[0] };
                 e = { ...e, ...goods[0] };
+              } catch (error) {
+                console.error("解析 JSON 时出错:", error);
+                // 跳出当前循环,继续处理下一个元素
+                continue;
               }
               }
-              if (e.specsValue) {
-                for (let i = 0; i < e.specsValue.length; i++) {
-                  let a = e.specsValue[i];
-                  e = { ...e, ...a };
-                }
+            }
+            if (e.specsValue) {
+              for (let i = 0; i < e.specsValue.length; i++) {
+                let a = e.specsValue[i];
+                e = { ...e, ...a };
               }
               }
-
-              console.log("1231231", e);
-              totalList.push(e);
             }
             }
-            this.spuList = totalList;
-            this.total = response.data.total;
-            this.loading = false;
+
+            console.log("1231231", e);
+            totalList.push(e);
           }
           }
+          this.spuList = totalList;
+          this.total = response.data.total;
+          this.loading = false;
         }
         }
-      );
+      });
     },
     },
 
 
     // 取消按钮
     // 取消按钮

+ 0 - 4
src/views/sortmanage/sort.vue

@@ -23,7 +23,6 @@
                 @start="start"
                 @start="start"
                 @end="end"
                 @end="end"
               >
               >
-                <transition-group>
                   <li
                   <li
                     class="items"
                     class="items"
                     v-for="(item, index) in sortList"
                     v-for="(item, index) in sortList"
@@ -40,7 +39,6 @@
                       <i class="el-icon-rank"></i>
                       <i class="el-icon-rank"></i>
                     </div>
                     </div>
                   </li>
                   </li>
-                </transition-group>
               </draggable>
               </draggable>
 
 
               <el-empty description="暂无分类数据" v-if="sortList.length == 0"></el-empty>
               <el-empty description="暂无分类数据" v-if="sortList.length == 0"></el-empty>
@@ -66,7 +64,6 @@
                 @start="start"
                 @start="start"
                 @end="end1"
                 @end="end1"
               >
               >
-                <transition-group>
                   <li
                   <li
                     class="items"
                     class="items"
                     v-for="(item, index) in sortListChildren"
                     v-for="(item, index) in sortListChildren"
@@ -82,7 +79,6 @@
                       <i class="el-icon-rank"></i>
                       <i class="el-icon-rank"></i>
                     </div>
                     </div>
                   </li>
                   </li>
-                </transition-group>
               </draggable>
               </draggable>
               <el-empty
               <el-empty
                 description="暂无分类数据"
                 description="暂无分类数据"

File diff suppressed because it is too large
+ 9765 - 9765
yarn.lock