Merge branch 'refs/heads/master' into ScrmStore

.env.prod-syysy

@@ -0,0 +1,40 @@
+# 页面标题
+VUE_APP_TITLE =互联网医院管理系统
+# 首页菜单标题
+VUE_APP_TITLE_INDEX =益寿缘
+# 公司名称
+VUE_APP_COMPANY_NAME =沈阳铁西益寿缘中医院有限责任公司
+# ICP备案号
+VUE_APP_ICP_RECORD =辽ICP备2024035076号-17
+# ICP网站访问地址
+VUE_APP_ICP_URL =https://beian.miit.gov.cn
+# 网站LOG
+VUE_APP_LOG_URL =@/assets/logo/syysy.png
+# 存储桶配置
+VUE_APP_OBS_ACCESS_KEY_ID = K2UTJGIN7UTZJR2XMXYG
+# 存储桶配置
+VUE_APP_OBS_SECRET_ACCESS_KEY = sbyeNJLbcYmH6copxeFP9pAoksM4NIT9Zw4x0SRX
+# 存储桶配置
+VUE_APP_OBS_SERVER = https://obs.cn-north-4.myhuaweicloud.com
+# 存储桶配置
+VUE_APP_OBS_BUCKET = syysy-hw079058881
+# 存储桶配置
+VUE_APP_COS_BUCKET = syysy -1323137866
+# 存储桶配置
+VUE_APP_COS_REGION = ap-chongqing
+# 线路一地址
+VUE_APP_VIDEO_LINE_1 = https://syysytcpv.ylrzcloud.com
+# 线路二地址
+VUE_APP_VIDEO_LINE_2 = https://syysyobs.ylrztop.com
+
+# 开发环境配置
+ENV = 'development'
+
+# 今正互联网医院管理系统/开发环境
+VUE_APP_BASE_API = '/prod-api'
+
+#默认 1、会员 2、企微
+VUE_APP_COURSE_DEFAULT = 1
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true

package.json

@@ -33,6 +33,8 @@
     "build:prod-bjyjb": "vue-cli-service build --mode prod-bjyjb",
     "build:prod-bjczwh": "vue-cli-service build --mode prod-bjczwh",
     "build:prod-fby": "vue-cli-service build --mode prod-fby",
+    "build:prod-zkzh": "vue-cli-service build --mode prod-zkzh",
+    "build:prod-syysy": "vue-cli-service build --mode prod-syysy",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src"
   },

src/api/hisStore/components/productOrder.vue

@@ -37,9 +37,9 @@
           <el-button size="mini" @click="addTuiMoney()" >分佣</el-button>
         </div>
 
-        <div class="operate-button-container" v-if="order.extendOrderId!=null"  v-hasPermi="['store:storeOrder:getEroOrder']"  >
+<!--        <div class="operate-button-container" v-if="order.extendOrderId!=null"  v-hasPermi="['store:storeOrder:getEroOrder']"  >
           <el-button size="mini" @click="showErpOrder()" >查看ERP订单信息</el-button>
-        </div>
+        </div>-->
         <div class="operate-button-container" v-if="order.isPayRemain!=null&&order.isPayRemain==1"  v-hasPermi="['store:storeOrder:auditPayRemain']"  >
           <el-button size="mini" @click="auditPayRemain()" >尾款审核</el-button>
         </div>

src/views/hisStore/components/productOrder.vue

@@ -24,7 +24,7 @@
           <el-button size="mini" @click="refundOrderMoney()" >退款</el-button>
         </div>
         <div class="operate-button-container"  v-hasPermi="['store:storeOrder:express']"  >
-          <el-button size="mini" @click="showExpress()" >查看物流</el-button>
+          <el-button size="mini" @click="showExpress()" v-if="false">查看物流</el-button>
         </div>
         <div class="operate-button-container" v-if="order.tuiMoneyStatus==0"  v-hasPermi="['store:storeOrder:editTuiMoney']"  >
           <el-button size="mini" @click="editTuiMoney1()" >解冻</el-button>
@@ -37,9 +37,9 @@
           <el-button size="mini" @click="addTuiMoney()" >分佣</el-button>
         </div>
 
-        <div class="operate-button-container" v-if="order.extendOrderId!=null"  v-hasPermi="['store:storeOrder:getEroOrder']"  >
+<!--        <div class="operate-button-container" v-if="order.extendOrderId!=null"  v-hasPermi="['store:storeOrder:getEroOrder']"  >
           <el-button size="mini" @click="showErpOrder()" >查看ERP订单信息</el-button>
-        </div>
+        </div>-->
         <div class="operate-button-container" v-if="order.isPayRemain!=null&&order.isPayRemain==1"  v-hasPermi="['store:storeOrder:auditPayRemain']"  >
           <el-button size="mini" @click="auditPayRemain()" >尾款审核</el-button>
         </div>
@@ -78,9 +78,9 @@
               <el-tag prop="payType" v-for="(item, index) in payTypeOptions"    v-if="order!=null&&order.payType==item.dictValue">{{item.dictLabel}}
               </el-tag>
             </el-descriptions-item>
-            <el-descriptions-item label="订单类型"  >
+<!--            <el-descriptions-item label="订单类型"  >
               <el-tag prop="orderType" v-for="(item, index) in orderTypeOptions"    v-if="order!=null&&order.orderType==item.dictValue">{{item.dictLabel}}</el-tag>
-            </el-descriptions-item>
+            </el-descriptions-item>-->
             <el-descriptions-item label="物流公司编号"  >
                 <span v-if="order!=null">
                   {{order.deliverySn}}
@@ -346,7 +346,7 @@
 
     <el-dialog :title="edit.title" :visible.sync="edit.open" width="600px" append-to-body>
       <el-form ref="editForm" :model="editForm" :rules="editRules" label-width="100px">
-        <el-form-item label="订单类型" prop="orderType"  >
+<!--        <el-form-item label="订单类型" prop="orderType"  >
             <el-select style="width: 200px" v-model="editForm.orderType" placeholder="请选择订单类型" clearable size="small" >
               <el-option
                       v-for="item in orderTypeOptions"
@@ -355,7 +355,7 @@
                       :value="item.dictValue"
                     />
             </el-select>
-        </el-form-item>
+        </el-form-item>-->
        <el-form-item label="状态" prop="status" >
            <el-select style="width:220px" v-model="editForm.status" placeholder="请选择状态" clearable size="small">
             <el-option key="0"  label="待支付" value="0" />
@@ -367,7 +367,7 @@
              <el-option key="-3"  label="已取消" value="-3" />
            </el-select>
          </el-form-item>
-         <el-form-item label="档期归属" prop="scheduleId"  >
+<!--         <el-form-item label="档期归属" prop="scheduleId"  >
             <el-select filterable style="width: 200px" v-model="editForm.scheduleId" placeholder="请选择档期" clearable size="small" >
               <el-option
                       v-for="item in scheduleOptions"
@@ -376,7 +376,7 @@
                       :value="item.id"
                     />
             </el-select>
-        </el-form-item>
+        </el-form-item>-->
          <el-form-item label="详情地址" prop="userAddress"  >
           <el-input v-model="editForm.userAddress" placeholder="请输入" />
         </el-form-item>
@@ -394,9 +394,9 @@
 
     <el-dialog :title="editDy.title" :visible.sync="editDy.open" width="600px" append-to-body>
       <el-form ref="editDyForm" :model="editDyForm" :rules="editDyRules" label-width="120px">
-      <div  v-hasPermi="['store:storeOrder:updateErpOrder']"  style="margin-bottom: 20px;" >
+<!--      <div  v-hasPermi="['store:storeOrder:updateErpOrder']"  style="margin-bottom: 20px;" >
         <el-button size="mini" @click="updateErpOrder" >同步物流单号信息</el-button>
-      </div>
+      </div>-->
         <el-form-item label="物流公司" prop="deliverySn" >
            <el-select style="width:220px" v-model="editDyForm.deliverySn" placeholder="请选择" clearable size="small">
             <el-option key="SF"  label="顺丰" value="SF" />
@@ -418,9 +418,9 @@
     </el-dialog>
 
     <el-dialog :title="expressDialog.title" :visible.sync="expressDialog.open" width="600px" append-to-body>
-      <div  v-hasPermi="['store:storeOrder:syncExpress']"  >
+<!--      <div  v-hasPermi="['store:storeOrder:syncExpress']"  >
         <el-button size="mini" @click="syncExpress()" >同步快递鸟物流状态</el-button>
-      </div>
+      </div>-->
       <el-table style="margin-top: 20px;width: 100%"
                 ref="orderHistoryTable"
                 :data="traces" border>

src/views/hisStore/storeOrder/healthStoreList.vue

@@ -52,7 +52,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="订单类型" prop="orderType">
+<!--      <el-form-item label="订单类型" prop="orderType">
          <el-select   v-model="queryParams.orderType" placeholder="请选择订单类型" clearable size="small" >
          <el-option
                 v-for="item in orderTypeOptions"
@@ -61,13 +61,13 @@
                 :value="item.dictValue"
               />
         </el-select>
-      </el-form-item>
-      <el-form-item label="上传凭证" prop="isUpload">
+      </el-form-item>-->
+<!--      <el-form-item label="上传凭证" prop="isUpload">
          <el-select   v-model="queryParams.isUpload" placeholder="请选择" clearable size="small" >
           <el-option key="0"  label="未上传" value="0" />
              <el-option key="1"  label="已上传" value="1" />
         </el-select>
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="物流状态" prop="deliveryStatus">
          <el-select   v-model="queryParams.deliveryStatus" placeholder="请选择物流状态" clearable size="small" >
          <el-option
@@ -236,11 +236,11 @@
               <el-tag prop="payType" v-for="(item, index) in payTypeOptions"    v-if="scope.row.payType==item.dictValue">{{item.dictLabel}}</el-tag>
           </template>
       </el-table-column>
-      <el-table-column label="订单类型" align="center" prop="orderType" >
+<!--      <el-table-column label="订单类型" align="center" prop="orderType" >
           <template slot-scope="scope">
               <el-tag prop="status" v-for="(item, index) in orderTypeOptions"    v-if="scope.row.orderType==item.dictValue">{{item.dictLabel}}</el-tag>
           </template>
-      </el-table-column>
+      </el-table-column>-->
       <el-table-column label="状态" align="center" prop="status" >
           <template slot-scope="scope">
               <el-tag prop="status" v-for="(item, index) in statusOptions"    v-if="scope.row.status==item.dictValue">{{item.dictLabel}}</el-tag>

src/views/hisStore/storeProduct/index.vue

@@ -271,7 +271,7 @@
         <el-form-item label="商品图片" prop="image">
           <Material v-model="imageArr" type="image" :num="1" :width="150" :height="150" />
         </el-form-item>
-        <el-form-item label="商品视频" prop="video">
+<!--        <el-form-item label="商品视频" prop="video">
           <div>
             <el-upload
               ref="upload"
@@ -286,7 +286,7 @@
             </el-upload>
             <video v-if="form.video" :src="form.video" controls style="max-width: 300px; max-height: 300px; margin-top: 10px"></video>
           </div>
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item label="轮播图" prop="sliderImage">
           <Material v-model="photoArr" type="image" :num="10" :width="150" :height="150" />
         </el-form-item>
@@ -658,7 +658,7 @@ export default {
     return {
       companyId: null,
       uploadUrl:process.env.VUE_APP_BASE_API+"/common/uploadOSS",
-      videoAccept:"video/*",
+      //videoAccept:"video/*",
       upload: {
         // 是否显示弹出层
         open: false,
@@ -852,7 +852,7 @@ export default {
     handleSuccess(response, file) {
       // 上传成功后的回调函数
       this.myloading.close();
-      this.form.video = response.url;
+      //this.form.video = response.url;
       this.$refs.upload.clearFiles();
     },
     beforeUpload(file) {

src/views/system/config/config.vue

@@ -983,65 +983,65 @@
         <el-form-item   label="erpOpen" prop="erpOpen">
             <el-input   v-model="form17.erpOpen"  label="请输入erpOpen"></el-input>
         </el-form-item>
-        <el-form-item   label="erpAppKey" prop="erpAppKey">
-            <el-input   v-model="form17.erpAppKey"  label="请输入erpAppKey"></el-input>
+        <el-form-item   label="未支付订单自动取消时间" prop="unPayTime">
+            <el-input   v-model="form17.unPayTime"  label="请输入unPayTime"></el-input>
         </el-form-item>
-        <el-form-item   label="erpSessionKey" prop="erpSessionKey">
-            <el-input   v-model="form17.erpSessionKey"  label="请输入erpSessionKey"></el-input>
+        <el-form-item   label="货到付款自定义金额" prop="payAmount">
+            <el-input   v-model="form17.payAmount"  label="请输入payAmount"></el-input>
         </el-form-item>
-        <el-form-item   label="erpSecret" prop="erpSecret">
-            <el-input   v-model="form17.erpSecret"  label="请输入erpSecret"></el-input>
+        <el-form-item   label="支付比例" prop="payRate">
+            <el-input   v-model="form17.payRate"  label="请输入payRate"></el-input>
         </el-form-item>
-        <el-form-item   label="erpUrl" prop="erpUrl">
-            <el-input   v-model="form17.erpUrl"  label="请输入erpUrl"></el-input>
+        <el-form-item   label="热门搜索" prop="hotSearch">
+            <el-input   v-model="form17.hotSearch"  label="请输入hotSearch"></el-input>
         </el-form-item>
-        <el-form-item   label="erpShopCode" prop="erpShopCode">
-            <el-input   v-model="form17.erpShopCode"  label="请输入erpShopCode"></el-input>
+        <el-form-item   label="服务费" prop="serviceFee">
+            <el-input   v-model="form17.serviceFee"  label="请输入serviceFee"></el-input>
         </el-form-item>
-        <el-form-item   label="appid" prop="appid">
-            <el-input   v-model="form17.appid"  label="请输入appid"></el-input>
+        <el-form-item   label="成本售价比例" prop="salesPriceRate">
+            <el-input   v-model="form17.salesPriceRate"  label="请输入salesPriceRate"></el-input>
         </el-form-item>
-        <el-form-item   label="secret" prop="secret">
-            <el-input   v-model="form17.secret"  label="请输入secret"></el-input>
+        <el-form-item   label="已完成订单售后有效天数" prop="storeAfterSalesDay">
+            <el-input   v-model="form17.storeAfterSalesDay"  label="请输入storeAfterSalesDay"></el-input>
         </el-form-item>
-        <el-form-item   label="token" prop="token">
-            <el-input   v-model="form17.token"  label="请输入token"></el-input>
+        <el-form-item   label="orderAttribution" prop="orderAttribution">
+            <el-input   v-model="form17.orderAttribution"  label="请输入orderAttribution"></el-input>
         </el-form-item>
-        <el-form-item   label="aesKey" prop="aesKey">
-            <el-input   v-model="form17.aesKey"  label="请输入aesKey"></el-input>
+        <el-form-item   label="refundAddress" prop="refundAddress">
+            <el-input   v-model="form17.refundAddress"  label="请输入refundAddress"></el-input>
         </el-form-item>
 
-        <el-form-item   label="msgDataFormat" prop="msgDataFormat">
-            <el-input   v-model="form17.msgDataFormat"  label="请输入msgDataFormat"></el-input>
+        <el-form-item   label="refundPhoneNumber" prop="refundPhoneNumber">
+            <el-input   v-model="form17.refundPhoneNumber"  label="请输入refundPhoneNumber"></el-input>
         </el-form-item>
 
-        <el-form-item   label="汇付产品号" prop="hfProductId">
-            <el-input   v-model="form17.hfProductId"  label="汇付产品号"></el-input>
+        <el-form-item   label="refundConsignee" prop="refundConsignee">
+            <el-input   v-model="form17.refundConsignee"  label="请输入refundConsignee"></el-input>
         </el-form-item>
-         <el-form-item v label="系统号" prop="hfSysId">
-            <el-input  v-model="form17.hfSysId" label="系统号Key"></el-input>
+         <el-form-item v label="订单改价方式" prop="createSalesOrderType">
+            <el-input  v-model="form17.createSalesOrderType" label="订单改价方式"></el-input>
         </el-form-item>
-        <el-form-item  label="商户号" prop="huifuId">
-            <el-input  v-model="form17.huifuId" label="商户号"></el-input>
+        <el-form-item  label="订单审核开关" prop="auditSwitch">
+            <el-input  v-model="form17.auditSwitch" label="订单审核开关"></el-input>
         </el-form-item>
-        <el-form-item  label="服务商私钥" prop="hfRsaPrivateKey">
-            <el-input  v-model="form17.hfRsaPrivateKey" label="服务商私钥"></el-input>
+        <el-form-item  label="公司制单金额最低比例" prop="createMoneyRate">
+            <el-input  v-model="form17.createMoneyRate" label="公司制单金额最低比例"></el-input>
         </el-form-item>
-        <el-form-item  label="汇付公钥" prop="hfRsaPublicKey">
-            <el-input  v-model="form17.hfRsaPublicKey" label="汇付公钥"></el-input>
-        </el-form-item>
-        <el-form-item  label="汇付支付回调地址" prop="hfPayNotifyUrl">
-            <el-input  v-model="form17.hfPayNotifyUrl" label="汇付支付回调地址"></el-input>
-        </el-form-item>
-        <el-form-item  label="大额支付回调地址" prop="hfPayOnlineNotifyUrl">
-            <el-input  v-model="form17.hfPayOnlineNotifyUrl" label="汇付支付回调地址"></el-input>
-        </el-form-item>
-        <el-form-item  label="汇付退款回调地址" prop="hfRefundNotifyUrl">
-            <el-input  v-model="form17.hfRefundNotifyUrl" label="汇付退款回调地址"></el-input>
-        </el-form-item>
-        <el-form-item  label="汇付大额退款回调地址" prop="hfOnlineRefundNotifyUrl">
-            <el-input  v-model="form17.hfOnlineRefundNotifyUrl" label="汇付大额退款回调地址"></el-input>
+       <el-form-item  label="公司佣金比例" prop="tuiMoneyRate">
+            <el-input  v-model="form17.tuiMoneyRate" label="公司佣金比例"></el-input>
         </el-form-item>
+                <el-form-item  label="汇付支付回调地址" prop="hfPayNotifyUrl">
+                    <el-input  v-model="form17.hfPayNotifyUrl" label="汇付支付回调地址"></el-input>
+                </el-form-item>
+                <el-form-item  label="大额支付回调地址" prop="hfPayOnlineNotifyUrl">
+                    <el-input  v-model="form17.hfPayOnlineNotifyUrl" label="汇付支付回调地址"></el-input>
+                </el-form-item>
+                <el-form-item  label="汇付退款回调地址" prop="hfRefundNotifyUrl">
+                    <el-input  v-model="form17.hfRefundNotifyUrl" label="汇付退款回调地址"></el-input>
+                </el-form-item>
+                <el-form-item  label="汇付大额退款回调地址" prop="hfOnlineRefundNotifyUrl">
+                    <el-input  v-model="form17.hfOnlineRefundNotifyUrl" label="汇付大额退款回调地址"></el-input>
+                </el-form-item>-->
 
         <div class="footer">
           <el-button type="primary" @click="submitForm17">提  交</el-button>