Merge remote-tracking branch 'origin/master'

.env.prod-hst

@@ -1,7 +1,7 @@
 # 页面标题
-VUE_APP_TITLE =互联网医院管理系统
+VUE_APP_TITLE =颐安心
 # 首页菜单标题
-VUE_APP_TITLE_INDEX =鸿森堂管理系统
+VUE_APP_TITLE_INDEX =颐安心
 # 公司名称
 VUE_APP_COMPANY_NAME =成都温江鸿森堂智慧互联网医院有限公司
 # ICP备案号

src/views/course/courseWatchLog/index.vue

@@ -413,6 +413,7 @@
           {{ row.watchType === 1 ? 'APP' : row.watchType === 2 ? '小程序' : '-' }}
         </template>
       </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="updateTime" />
       <el-table-column label="完课时间" align="center" prop="finishTime" />

src/views/his/medicatedFood/index.vue

@@ -351,15 +351,15 @@ export default {
               sort: [
                 { 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: [
                 { required: true, message: '请选择状态', trigger: 'change' },
               ],

src/views/hisStore/components/productOrder.vue

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

src/views/hisStore/storeOrder/dimensionStatistics/index.vue

@@ -132,6 +132,8 @@
       <el-table-column label="员工名称" align="center" prop="nickName"/>
       <el-table-column label="总单数" align="center" prop="totalNum"/>
       <el-table-column label="总金额" align="center" prop="totalPrice"/>
+      <el-table-column v-if="zdyInfo === 'gzzdy'" label="在途单数" align="center" prop="transitNum"/>
+      <el-table-column v-if="zdyInfo === 'gzzdy'" label="在途金额" align="center" prop="transitPrice"/>
       <el-table-column label="成交单数" align="center" prop="dealNum"/>
       <el-table-column v-if="zdyInfo !== 'gzzdy'" label="成交金额" align="center" prop="dealPrice"/>
       <el-table-column v-if="zdyInfo === 'gzzdy'" label="实收金额" align="center" prop="dealPrice"/>
@@ -142,6 +144,7 @@
       <el-table-column v-if="zdyInfo !== 'gzzdy'" label="发货单数" align="center" prop="invoiceNum"/>
       <el-table-column v-if="zdyInfo !== 'gzzdy'" label="发货金额" align="center" prop="invoicePrice"/>
       <el-table-column v-if="zdyInfo === 'gzzdy'" label="代收金额" align="center" prop="invoicePrice"/>
+      <el-table-column v-if="zdyInfo === 'gzzdy'" label="结算金额" align="center" prop="settlementPrice"/>
       <el-table-column label="签收单数" align="center" prop="signForNum"/>
       <el-table-column label="签收金额" align="center" prop="signFPrice"/>
       <el-table-column label="退单数" align="center" prop="chargebackNum"/>

src/views/system/config/config.vue

@@ -1137,6 +1137,9 @@
           <el-form-item label="hook地址" prop="hookUrl">
             <el-input v-model="form13.hookUrl" label="请输入hook域名"></el-input>
           </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-input   v-model="form13.appPushUrl"  label="请输入App推送通知地址"></el-input>
           </el-form-item>