1
0

5 Ревизии e224ffa543 ... f8f971f9bd

Автор SHA1 Съобщение Дата
  caoliqin f8f971f9bd feat:订单修改代收金额最小改成0 преди 1 седмица
  caoliqin bc2c9a0cb5 feat:鸿森堂需求 преди 1 седмица
  caoliqin 32fa89fc11 Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_adminUI преди 1 седмица
  caoliqin a9c0c690f1 Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_adminUI преди 2 седмици
  caoliqin 24a63ed2d1 feat:aikanshe-配置appkey преди 2 седмици

+ 1 - 0
src/views/course/courseWatchLog/index.vue

@@ -413,6 +413,7 @@
           {{ row.watchType === 1 ? 'APP' : row.watchType === 2 ? '小程序' : '-' }}
           {{ row.watchType === 1 ? 'APP' : row.watchType === 2 ? '小程序' : '-' }}
         </template>
         </template>
       </el-table-column>
       </el-table-column>
+      <el-table-column label="看课IP" align="center" prop="lastIp" width="100"/>
       <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="更新时间" align="center" prop="updateTime" />
       <el-table-column label="更新时间" align="center" prop="updateTime" />
       <el-table-column label="完课时间" align="center" prop="finishTime" />
       <el-table-column label="完课时间" align="center" prop="finishTime" />

+ 9 - 9
src/views/his/medicatedFood/index.vue

@@ -351,15 +351,15 @@ export default {
               sort: [
               sort: [
                 { required: true, type: 'number', message: '请输入排序', trigger: 'blur' },
                 { required: true, type: 'number', message: '请输入排序', trigger: 'blur' },
               ],
               ],
-              action: [
-                { required: true, message: '请输入功效', trigger: 'blur' },
-              ],
-              food: [
-                { required: true, message: '请输入食材', trigger: 'blur' },
-              ],
-              indications: [
-                { required: true, message: '请输入疾病', trigger: 'blur' },
-              ],
+              // action: [
+              //   { required: true, message: '请输入功效', trigger: 'blur' },
+              // ],
+              // food: [
+              //   { required: true, message: '请输入食材', trigger: 'blur' },
+              // ],
+              // indications: [
+              //   { required: true, message: '请输入疾病', trigger: 'blur' },
+              // ],
               status: [
               status: [
                 { required: true, message: '请选择状态', trigger: 'change' },
                 { required: true, message: '请选择状态', trigger: 'change' },
               ],
               ],

+ 1 - 1
src/views/hisStore/components/productOrder.vue

@@ -743,7 +743,7 @@
         <el-form-item label="代收金额(元)" prop="payDelivery">
         <el-form-item label="代收金额(元)" prop="payDelivery">
           <el-input-number
           <el-input-number
             v-model="payDeliveryForm.payDelivery"
             v-model="payDeliveryForm.payDelivery"
-            :min="0.01"
+            :min="0.00"
             :precision="2"
             :precision="2"
             :step="0.01"
             :step="0.01"
             size="small"
             size="small"

+ 3 - 0
src/views/system/config/config.vue

@@ -1137,6 +1137,9 @@
           <el-form-item label="hook地址" prop="hookUrl">
           <el-form-item label="hook地址" prop="hookUrl">
             <el-input v-model="form13.hookUrl" label="请输入hook域名"></el-input>
             <el-input v-model="form13.hookUrl" label="请输入hook域名"></el-input>
           </el-form-item>
           </el-form-item>
+          <el-form-item label="舌诊appkey" prop="tongueAppKey">
+            <el-input v-model="form13.tongueAppKey" label="请输入舌诊密钥"></el-input>
+          </el-form-item>
           <el-form-item   label="App推送通知地址" prop="appPushUrl">
           <el-form-item   label="App推送通知地址" prop="appPushUrl">
             <el-input   v-model="form13.appPushUrl"  label="请输入App推送通知地址"></el-input>
             <el-input   v-model="form13.appPushUrl"  label="请输入App推送通知地址"></el-input>
           </el-form-item>
           </el-form-item>