95:红德堂APP调试 积分+现金支付、付费课程订阅加积分

src/views/components/his/integralGoodsDetails.vue

@@ -17,6 +17,7 @@
 
 
           <el-descriptions-item label="所需积分"><span v-if="item!=null">{{item.integral}}</span></el-descriptions-item>
+          <el-descriptions-item label="需支付金额"><span v-if="item!=null">{{item.cash}}</span></el-descriptions-item>
           <el-descriptions-item label="排序"><span v-if="item!=null">{{item.sort}}</span></el-descriptions-item>
           <el-descriptions-item label="库存"><span v-if="item!=null">{{item.stock}}</span></el-descriptions-item>
           <el-descriptions-item label="状态"><span v-if="item!=null"> <dict-tag :options="statusOptions" :value="item.status"/></span></el-descriptions-item>

src/views/components/his/integralOrderDetails.vue

@@ -5,8 +5,9 @@
       </div>
 <div class="contentx" v-if="item!=null">
         <div class="desct"> 积分订单信息</div>
-        <div class="order-status" v-if="item!=null" >
-                  <el-steps  :active="item.status==3?item.status:item.status-1" align-center finish-status="success">
+        <div class="order-status" v-if="item!=null && item.status != 5" >
+                  <el-steps  :active="item.status==4?0:item.status" align-center finish-status="success">
+                    <el-step title="待支付"></el-step>
                     <el-step title="待发货"></el-step>
                     <el-step title="待收货"></el-step>
                     <el-step title="已完成"></el-step>
@@ -76,6 +77,11 @@
                   <p>￥{{scope.row.integral}}</p>
                 </template>
               </el-table-column>
+              <el-table-column label="金额" align="center">
+               <template slot-scope="scope">
+                 <p>￥{{scope.row.cash || 0}}</p>
+               </template>
+              </el-table-column>
 
             </el-table>
        </div>

src/views/his/integralGoods/index.vue

@@ -122,6 +122,7 @@
         </template>
       </el-table-column>
       <el-table-column label="所需积分" align="center" prop="integral" />
+      <el-table-column label="需支付金额" align="center" prop="cash" />
       <el-table-column label="排序" align="center" prop="sort" />
       <el-table-column label="库存" align="center" prop="stock" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180"/>
@@ -188,6 +189,9 @@
         <el-form-item label="所需积分" prop="integral">
           <el-input-number v-model="form.integral"  :min="0"  label="所需积分"></el-input-number>
         </el-form-item>
+        <el-form-item label="支付金额" prop="cash">
+          <el-input-number v-model="form.cash"  :min="0" :precision="2" :step="0.1"  label="需支付金额"></el-input-number>
+        </el-form-item>
         <el-form-item label="商品编号" prop="barCode">
           <el-input v-model="form.barCode" placeholder="请输入商品编号"  style="width: 200px;"/>
         </el-form-item>
@@ -412,6 +416,7 @@ export default {
         goodsType: null,
         status: 0,
         integral: null,
+        cash: null,
         sort: null,
         stock: null,
         descs: null,

src/views/his/integralOrder/index.vue

@@ -124,6 +124,7 @@
       <el-table-column label="用户电话" align="center" prop="userPhone" />
       <el-table-column label="用户地址" align="center" prop="userAddress" show-overflow-tooltip />
       <el-table-column label="支付积分" align="center" prop="integral" />
+      <el-table-column label="支付金额" align="center" prop="cash" />
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="statusOptions" :value="scope.row.status"/>

src/views/system/config/integralConfig.vue

@@ -19,9 +19,9 @@
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item  label="填写就诊人信息获得积分" prop="IntegralAddPatient">
+          <el-form-item  label="填写就诊人信息获得积分" prop="integralAddPatient">
             <el-tooltip class="item" effect="dark" content="首次填写就诊人信息，赠送多少积分" placement="top-end">
-              <el-input-number  v-model="form11.IntegralAddPatient"   ></el-input-number>
+              <el-input-number  v-model="form11.integralAddPatient"   ></el-input-number>
             </el-tooltip>
           </el-form-item>
         </el-col>
@@ -116,9 +116,9 @@
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item  label="单日可获总积分" prop="integralByOneDay">
-            <el-tooltip class="item" effect="dark" content="每天最多可获得多少积分" placement="top-end">
-              <el-input-number  v-model="form11.integralByOneDay"   ></el-input-number>
+          <el-form-item  label="付费课程订阅" prop="integralSubscriptCourse">
+            <el-tooltip class="item" effect="dark" content="实付1元得多少积分" placement="top-end">
+              <el-input-number  v-model="form11.integralSubscriptCourse"   ></el-input-number>
             </el-tooltip>
           </el-form-item>
         </el-col>
@@ -130,6 +130,15 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item  label="单日可获总积分" prop="integralByOneDay">
+            <el-tooltip class="item" effect="dark" content="每天最多可获得多少积分" placement="top-end">
+              <el-input-number  v-model="form11.integralByOneDay"   ></el-input-number>
+            </el-tooltip>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-form-item label="单日可获总积分类型" prop="integralTypeByOneDay">
         <el-select v-model="form11.integralTypeByOneDay" multiple placeholder="请选择类型" filterable clearable size="small">
           <el-option
@@ -158,7 +167,7 @@ export default {
       form11: {
         integralRegister: null,
         integralFinishConsultation: null,
-        IntegralAddPatient: null,
+        integralAddPatient: null,
         integralAddUserAddress: null,
         integralInvite: null,
         integralInvited: null,
@@ -173,6 +182,7 @@ export default {
         integralByOneDay: null,
         integralFirstOrderPoint: null,
         integralTypeByOneDay: null,
+        integralSubscriptCourse: null,
       },
       saveLoading: false,
     }