Merge branch 'master' of http://159.75.201.17:3000/zwq/tuanfeng-pc-admin

src/views/finance/flowingWater/index.vue

@@ -47,12 +47,21 @@
           </el-table-column>
           <el-table-column label="支付方式">
             <template slot-scope="scope">
-              <span v-if="scope.row.paymentMode == 1">微信</span>
-              <span v-if="scope.row.paymentMode == 2">支付宝</span>
-              <span v-if="scope.row.paymentMode == 3">余额</span>
-              <span v-if="scope.row.paymentMode == 4">通联</span>
+							<span v-if="scope.row.paymentMode === 1">微信</span>
+							<span v-else-if="scope.row.paymentMode === 2">支付宝</span>
+							<span v-else-if="scope.row.paymentMode === 3">花呗分期</span>
+							<span v-else-if="scope.row.paymentMode === 4">通联支付</span>
+							<span v-else-if="scope.row.paymentMode === 5">平台余额支付</span>
+							<span v-else-if="scope.row.paymentMode === 6">商家余额支付</span>
+							<span v-else-if="scope.row.paymentMode === 7">佣金支付</span>
+							<span v-else-if="scope.row.paymentMode === 8">交易金支付</span>
+							<span v-else-if="scope.row.paymentMode === 9">惠市宝支付</span>
+							<span v-else>--</span>
             </template>
           </el-table-column>
+          <el-table-column label="订单编号" width="180">
+            <template slot-scope="scope">{{ scope.row.orderFormid }}</template>
+          </el-table-column>
           <el-table-column label="创建时间" width="220">
             <template slot-scope="scope">{{ scope.row.createTime }}</template>
           </el-table-column>

src/views/finance/withdrawal/components/RelatedOrders.vue

@@ -28,13 +28,15 @@
         <el-table-column align="center" min-width="100" prop="price" label="支付金额" show-overflow-tooltip />
         <el-table-column align="center" min-width="120" label="支付方式" prop="paymentMode">
           <template slot-scope="{ row }">
-            <span v-if="row.paymentMode === 1">微信支付</span>
-            <span v-else-if="row.paymentMode === 2">支付宝支付</span>
+            <span v-if="row.paymentMode === 1">微信</span>
+            <span v-else-if="row.paymentMode === 2">支付宝</span>
             <span v-else-if="row.paymentMode === 3">花呗分期</span>
-            <span v-else-if="row.paymentMode === 4">通联支付（微信）</span>
+            <span v-else-if="row.paymentMode === 4">通联支付</span>
             <span v-else-if="row.paymentMode === 5">平台余额支付</span>
             <span v-else-if="row.paymentMode === 6">商家余额支付</span>
             <span v-else-if="row.paymentMode === 7">佣金支付</span>
+            <span v-else-if="row.paymentMode === 8">交易金支付</span>
+            <span v-else-if="row.paymentMode === 9">惠市宝支付</span>
             <span v-else>--</span>
           </template>
         </el-table-column>

src/views/order/pending/index.vue

@@ -76,13 +76,19 @@
           <el-table-column prop="price" label="支付金额（元）" width="120" />
           <el-table-column prop="voucherPrice" label="抵扣金额" show-overflow-tooltip />
           <el-table-column prop="createTime" label="下单时间" show-overflow-tooltip />
-          <el-table-column label="订单状态" show-overflow-tooltip>
+          <el-table-column label="订单状态" min-width="120" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span v-if="scope.row.state == 1" :style="{ color: '#E6A23C' }">待付款</span>
-              <span v-if="scope.row.state == 2" :style="{ color: '#F56C6C' }">待发货</span>
-              <span v-if="scope.row.state == 3" :style="{ color: '#409EFF' }">已发货</span>
-              <span v-if="scope.row.state == 4" :style="{ color: '#67C23A' }">已完成</span>
-              <span v-if="scope.row.state == 5" :style="{ color: '#909399' }">已关闭</span>
+							<span v-if="scope.row.state == 1">待付款</span>
+							<span v-else-if="scope.row.state == 2">待发货</span>
+							<span v-else-if="scope.row.state == 3">待收货</span>
+							<span v-else-if="scope.row.state == 4">已完成</span>
+							<span v-else-if="scope.row.state == 5">交易关闭（已取消）</span>
+							<span v-else-if="scope.row.state == 6">待成团</span>
+							<span v-else-if="scope.row.state == 7">待售后</span>
+							<span v-else-if="scope.row.state == 8">待核销（未付款）</span>
+							<span v-else-if="scope.row.state == 9">待核销（已付款）</span>
+							<span v-else-if="scope.row.state == 10">已核销</span>
+							<span v-else>--</span>
             </template>
           </el-table-column>
 

src/views/order/pending/pendDetails.vue

@@ -18,15 +18,25 @@
                 <span>支付单号:</span>
                 <span>{{ order.transactionId }}</span>
               </p>
+              <p>
+                <span>订单编号:</span>
+                <span>{{ order.orderFormid }}</span>
+              </p>
             </li>
             <li>
               <p>
                 <span>订单状态:</span>
-                <span v-if="order.state === 1">待付款</span>
-                <span v-if="order.state === 2">待发货</span>
-                <span v-if="order.state === 3">待收货</span>
-                <span v-if="order.state === 4">已完成</span>
-                <span v-if="order.state === 5">已取消</span>
+                <span v-if="order.state == 1">待付款</span>
+                <span v-else-if="order.state == 2">待发货</span>
+                <span v-else-if="order.state == 3">待收货</span>
+                <span v-else-if="order.state == 4">已完成</span>
+                <span v-else-if="order.state == 5">交易关闭（已取消）</span>
+                <span v-else-if="order.state == 6">待成团</span>
+                <span v-else-if="order.state == 7">待售后</span>
+                <span v-else-if="order.state == 8">待核销（未付款）</span>
+                <span v-else-if="order.state == 9">待核销（已付款）</span>
+                <span v-else-if="order.state == 10">已核销</span>
+                <span v-else>--</span>
               </p>
               <p>
                 <span>售后状态:</span>
@@ -37,7 +47,15 @@
               <p>
                 <span>支付方式:</span>
                 <span v-if="order.paymentMode === 1">微信</span>
-                <span v-if="order.paymentMode === 2">支付宝</span>
+                <span v-else-if="order.paymentMode === 2">支付宝</span>
+                <span v-else-if="order.paymentMode === 3">花呗分期</span>
+                <span v-else-if="order.paymentMode === 4">通联支付</span>
+                <span v-else-if="order.paymentMode === 5">平台余额支付</span>
+                <span v-else-if="order.paymentMode === 6">商家余额支付</span>
+                <span v-else-if="order.paymentMode === 7">佣金支付</span>
+                <span v-else-if="order.paymentMode === 8">交易金支付</span>
+                <span v-else-if="order.paymentMode === 9">惠市宝支付</span>
+                <span v-else>--</span>
               </p>
               <p>
                 <span>物流方案:</span>
@@ -99,7 +117,7 @@
                     <p>{{ item.productName }}</p>
                     <p class="skuDetails">
                       <span
-                        v-for="(detailsItem, detailsindex) of item.skuDetails" :key="detailsindex"
+                        v-for="(detailsItem, detailsindex) in item.skuDetails" :key="detailsindex"
                         class="detail_span"
                       >
                         {{ detailsItem.skuName }}: {{ detailsItem.skuValue }}
@@ -125,9 +143,9 @@
             v-if="!order.logisticsNum"
             class="send_good"
             @click="send"
-          >
+            >
             去发货
-          </p>-->
+            </p> -->
           <el-button
             v-if="!order.logisticsNum && order.state == 2" type="primary" class="send_good"
             @click="send"
@@ -143,10 +161,10 @@
               v-for="(item, index) in tracesList"
               :key="index"
               class="logistics_item"
-            >
+              >
               <span>{{ item.acceptTime }}</span>
               <span>{{ acceptStation }}</span>
-            </p> -->
+              </p> -->
           </div>
         </div>
       </div>
@@ -179,15 +197,16 @@
         <el-form-item label="快递单号" prop="deliverFormid">
           <el-input v-model="form.deliverFormid" maxlength="20" oninput="value = value.replace(/[^\a-\z\A-\Z0-9]/g,'')" />
         </el-form-item>
-        <!--
-        <el-form-item label="快递公司编号" prop="shipperCode" v-if="false">
+        <!-- <el-form-item label="快递公司编号" prop="shipperCode" v-if="false">
           <el-input v-model="form.shipperCode" />
-        </el-form-item>-->
+          </el-form-item> -->
       </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="confirm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button type="primary" @click="confirm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </span>
+      </template>
     </el-dialog>
   </div>
 </template>