Merge remote-tracking branch 'origin/康年堂' into 康年堂

src/views/hisStore/components/productAfterSalesOrder.vue

@@ -38,6 +38,11 @@
                   {{user.nickname}}({{user.phone}})
                 </span>
             </el-descriptions-item>
+            <el-descriptions-item label="实付金额"  >
+                  <span v-if="order!=null">
+                    {{order.payMoney}}
+                  </span>
+            </el-descriptions-item>
             <el-descriptions-item label="退款金额"  >
                 <span v-if="afterSales!=null">
                   {{afterSales.refundAmount}}
@@ -80,33 +85,28 @@
         </div>
         <el-descriptions   :column="4" border  >
             <el-descriptions-item label="收货人"  >
-                <span v-if="afterSales!=null">
-                  {{afterSales.consignee}}
-                </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="收货人"  >
-                <span v-if="afterSales!=null">
-                  {{afterSales.consignee}}
+                <span v-if="order!=null">
+                  {{order.realName}}
                 </span>
             </el-descriptions-item>
             <el-descriptions-item label="手机号码"  >
-                <span v-if="afterSales!=null">
-                  {{afterSales.phoneNumber}}
+                <span v-if="order!=null">
+                  {{order.userPhone}}
                 </span>
             </el-descriptions-item>
             <el-descriptions-item label="收货地址"  >
-                <span v-if="afterSales!=null">
-                  {{afterSales.address}}
+                <span v-if="order!=null">
+                  {{order.userAddress}}
                 </span>
             </el-descriptions-item>
             <el-descriptions-item label="快递公司"  >
-                <span v-if="afterSales!=null">
-                  {{afterSales.deliveryName}}
+                <span v-if="order!=null">
+                  {{order.deliveryName}}
                 </span>
             </el-descriptions-item>
             <el-descriptions-item label="运单号"  >
-                <span v-if="afterSales!=null">
-                  {{afterSales.deliverySn}}
+                <span v-if="order!=null">
+                  {{order.deliveryId}}
                 </span>
             </el-descriptions-item>
         </el-descriptions>
@@ -150,11 +150,11 @@
             </template>
           </el-table-column>
         </el-table>
-        <div style="margin-top: 12px; text-align: right;" v-if="order">
-          <div>订单金额：￥{{ goodsTotal.toFixed(2) }}</div>
-          <div>运费金额：￥{{ (order.payPostage || 0).toFixed(2) }}</div>
-          <div>实付金额：￥{{ (goodsTotal + (order.payPostage || 0)).toFixed(2) }}</div>
-        </div>
+<!--        <div style="margin-top: 12px; text-align: right;" v-if="order">-->
+<!--          <div>订单金额：￥{{ goodsTotal.toFixed(2) }}</div>-->
+<!--          <div>运费金额：￥{{ (order.payPostage || 0).toFixed(2) }}</div>-->
+<!--          <div>实付金额：￥{{ (goodsTotal + (order.payPostage || 0)).toFixed(2) }}</div>-->
+<!--        </div>-->
         <div style="margin-top: 20px">
           <svg-icon icon-class="marker" style="color: #606266"></svg-icon>
           <span class="font-small">操作信息</span>
@@ -184,7 +184,7 @@
     <el-dialog :title="audit.title" :visible.sync="audit.open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="退款金额" prop="refundAmount"  >
-          <el-input-number v-model="form.refundAmount" :min="0"  />
+          <el-input-number v-model="form.refundAmount" :min="0" :max=order.payMoney />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -275,17 +275,17 @@ export default {
 
     };
   },
-  computed: {
-    goodsTotal() {
-      if (!this.items || this.items.length === 0) return 0;
-      return this.items.reduce((sum, it) => {
-        const info = JSON.parse(it.jsonInfo || "{}");
-        const num = Number(it.num != null ? it.num : info.num) || 0;
-        const price = Number(info.price) || 0;
-        return sum + num * price;
-      }, 0);
-    }
-  },
+  // computed: {
+  //   goodsTotal() {
+  //     if (!this.items || this.items.length === 0) return 0;
+  //     return this.items.reduce((sum, it) => {
+  //       const info = JSON.parse(it.jsonInfo || "{}");
+  //       const num = Number(it.num != null ? it.num : info.num) || 0;
+  //       const price = Number(info.price) || 0;
+  //       return sum + num * price;
+  //     }, 0);
+  //   }
+  // },
   created() {
     this.getDicts("store_after_sales_sales_status").then((response) => {
         this.salesStatusOptions = response.data;

src/views/system/config/config.vue

@@ -358,6 +358,17 @@
               <el-input-number v-model="form7.followRate" :min="0" :max="1000"></el-input-number>
             </el-tooltip>
           </el-form-item>
+          <el-form-item  label="年支付金额限制" prop="yearPayPrice">
+            <el-input-number v-model="form7.yearPayPrice" :precision="2" :step="0.1"></el-input-number>
+          </el-form-item>
+          <el-form-item  label="达限后支付限制金额" prop="canPayPrice">
+            <el-input-number v-model="form7.canPayPrice" :precision="2" :step="0.1"></el-input-number>
+          </el-form-item>
+          <el-form-item  label="支付金额达限提示" prop="payPriceTip">
+            <el-tooltip class="item" effect="dark" content="支付金额达限提示" placement="top-end">
+              <el-input    v-model="form7.payPriceTip"   ></el-input>
+            </el-tooltip>
+          </el-form-item>
           <el-form-item  label="是否需要根据物流信息更新订单完成状态" prop="isUpdateOrder">
             <el-switch
               v-model="form7.isUpdateOrder"