Merge branch 'feature/xym' into 'release'

Feature/xym

See merge request !304

.env.development.local

@@ -17,4 +17,4 @@ VUE_APP_IS_LOCAL=true
 VUE_APP_APPID=wxf4e66242d31c81c2
 
 #本地token
-VUE_APP_TOKEN=609ED00303E54EEF9AEE2F8BB9A34CD8
+VUE_APP_TOKEN=F5C0CE7C1278471CA133A7CDAE4AC4F5

src/utils/GeneralData/diagnosis-list-new.js

@@ -34,9 +34,19 @@ export const DIAGNOS_LIST_NEW = [
   },
   {
     prop: 'price',
+    label: '订单实付',
+    showtooltip: false,
+  },
+  {
+    prop: 'paymentOrder',
     label: '订单金额',
     showtooltip: false,
   },
+  {
+    prop: 'discountAmount',
+    label: '优惠',
+    showtooltip: false,
+  },
   {
     prop: 'consultRoad',
     label: '业务类型',

src/views/IM/diagnosis-admin/diagnosis-editor.vue

@@ -81,13 +81,25 @@
             value-format="yyyy-MM-dd HH:mm:ss"
           />
         </el-form-item>
+        <el-form-item
+          label="订单实付"
+          prop="price"
+        >
+          <el-input
+            v-model="formData.price"
+            placeholder="请输入订单实付"
+            disabled
+            class="set-width"
+          />
+          (单位元)
+        </el-form-item>
         <el-form-item
           label="订单金额"
-          prop="orderTotalPrice"
+          prop="paymentOrder"
         >
           <el-input
-            v-model="formData.orderTotalPrice"
-            placeholder="请输入问诊价格"
+            v-model="formData.paymentOrder"
+            placeholder="订单金额"
             disabled
             class="set-width"
           />
@@ -95,10 +107,10 @@
         </el-form-item>
         <el-form-item
           label="问诊价格"
-          prop="price"
+          prop="diagnosePrice"
         >
           <el-input
-            v-model="formData.price"
+            v-model="formData.diagnosePrice"
             placeholder="请输入问诊价格"
             disabled
             class="set-width"
@@ -117,6 +129,18 @@
           />
           (单位元)
         </el-form-item>
+        <el-form-item
+          label="优惠金额"
+          prop="discountAmount"
+        >
+          <el-input
+            v-model="formData.discountAmount"
+            placeholder="请输入优惠金额"
+            disabled
+            class="set-width"
+          />
+          (单位元)
+        </el-form-item>
         <el-form-item label="问诊方式">
           <el-select
             v-model="formData.diagnoseChannel"
@@ -1603,10 +1627,23 @@ export default {
             this.formData.additionPrice = this.priceFilter(
               this.formData.additionPrice
             );
-            this.formData.orderTotalPrice =
-              this.formData.price + this.formData.additionPrice;
-            this.formData.serviceFee = this.priceFilter(
-              this.formData.serviceFee
+
+            this.formData.paymentOrder = this.priceFilter(
+              this.formData.paymentOrder
+            );
+            // this.formData.orderTotalPrice =
+            //   this.formData.price + this.formData.additionPrice;
+            // this.formData.serviceFee = this.priceFilter(
+            //   this.formData.serviceFee
+            // );
+            // this.formData.actualPaymentOrder = this.priceFilter(
+            //   this.formData.actualPaymentOrder
+            // );
+            this.formData.diagnosePrice = this.priceFilter(
+              this.formData.diagnosePrice
+            );
+            this.formData.discountAmount = this.priceFilter(
+              this.formData.discountAmount
             );
             if (!this.formData.illnessImageUrls) {
               this.formData.illnessImageUrls = [];

src/views/IM/diagnosis-admin/diagnosis-list-new.vue

@@ -1246,6 +1246,9 @@ export default {
             return {
               ...item,
               price: item.price > 0 ? item.price / 100 : 0,
+              discountAmount:
+                item.discountAmount > 0 ? item.discountAmount / 100 : 0,
+              paymentOrder: item.paymentOrder > 0 ? item.paymentOrder / 100 : 0,
             };
           });
           this.totalRows = res.data.allSize;

vue.config.js

@@ -70,7 +70,7 @@ module.exports = {
     port: 8082,
     proxy: {
       '/proxy': {
-        target: 'https://dev-sso.yunqueyi.com/',
+        target: 'https://dev-sc.yunqueyi.com/',
         ws: false,
         changeOrigin: true,
         secure: true,