三七 преди 2 дни
родител
ревизия
3fffcae7ba
променени са 5 файла, в които са добавени 69 реда и са изтрити 23 реда
  1. 44 0
      .env.prod-sxsm
  2. 1 0
      package.json
  3. BIN
      src/assets/logo/sxsm.jpg
  4. BIN
      src/assets/logo/sxsm.png
  5. 24 23
      src/views/live/liveOrder/liveOrderDetails.vue

+ 44 - 0
.env.prod-sxsm

@@ -0,0 +1,44 @@
+# 页面标题
+VUE_APP_TITLE =三猫总管理系统
+# 首页菜单标题
+VUE_APP_TITLE_INDEX =三猫网
+# 公司名称
+VUE_APP_COMPANY_NAME =西安挑宝益康医药连锁有限公司丈八西路第二分公司
+# ICP备案号
+VUE_APP_ICP_RECORD =陕ICP备2023000555号-8
+# ICP网站访问地址
+VUE_APP_ICP_URL =https://beian.miit.gov.cn
+# 网站LOG
+VUE_APP_LOG_URL =@/assets/logo/sxsm.jpg
+# 存储桶配置
+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 =
+# 存储桶配置
+VUE_APP_COS_BUCKET = sxsm-1323137866
+# 存储桶配置
+VUE_APP_COS_REGION = ap-chongqing
+# 线路一地址
+VUE_APP_VIDEO_LINE_1 = https://sxsmtcpv.ylrzcloud.com
+# 线路二地址
+VUE_APP_VIDEO_LINE_2 =
+#火山云视频地址域名
+VUE_APP_VIDEO_URL = https://sxsmvolcengine.ylrztop.com
+#火山云视频点播空间名
+VUE_APP_HSY_SPACE = sxsm-2114522511
+
+# 开发环境配置
+ENV = 'development'
+
+# 今正互联网医院管理系统/开发环境
+VUE_APP_BASE_API = '/prod-api'
+
+#默认 1、会员 2、企微
+VUE_APP_COURSE_DEFAULT = 1
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true

+ 1 - 0
package.json

@@ -20,6 +20,7 @@
     "build:prod-fzbt": "vue-cli-service build --mode prod-fzbt",
     "build:prod-sxjz": "vue-cli-service build --mode prod-sxjz",
     "build:prod-sxtb": "vue-cli-service build --mode prod-sxtb",
+    "build:prod-sxsm": "vue-cli-service build --mode prod-sxsm",
     "build:prod-xfk": "vue-cli-service build --mode prod-xfk",
     "build:prod-jnmy": "vue-cli-service build --mode prod-jnmy",
     "build:prod-knt": "vue-cli-service build --mode prod-knt",

BIN
src/assets/logo/sxsm.jpg


BIN
src/assets/logo/sxsm.png


+ 24 - 23
src/views/live/liveOrder/liveOrderDetails.vue

@@ -43,7 +43,7 @@
           <div class="operate-button-container" v-if="item.extendOrderId!=null"  >
             <el-button size="mini" @click="showErpOrder()" >ERP订单信息</el-button>
           </div>
-          <div class="operate-button-container" v-if="item.status>1">
+          <div class="operate-button-container" v-if="item.status>=1">
             <el-button size="mini" @click="refund()" v-hasPermi="['his:liveOrder:refundOrderMoney']">退款</el-button>
           </div>
         </div>
@@ -307,7 +307,7 @@
 
 
     <el-dialog :title="erpDialog.title" :visible.sync="erpDialog.open" width="600px" append-to-body>
-      <div v-if="order!=null&&order.extendOrderId!=null&&order.status==1"  v-hasPermi="['store:storeOrder:updateExpress']"  >
+      <div v-if="this.item!=null&&this.item.extendOrderId!=null&&this.item.status==1"  v-hasPermi="['store:storeOrder:updateExpress']"  >
         <el-button size="mini" @click="updateExpress()" >同步物流发货</el-button>
       </div>
       <div class="table-layout"  v-if="erpOrder!=null">
@@ -939,30 +939,31 @@ export default {
       this.tuiMoneyLogs=null;
       this.afterSales=null;
       getLiveOrderAll(orderId).then(response => {
-        this.item = response.order;
-        console.log(this.tuiMoneyLogs)
-        this.tuiMoneyLogs = response.tuiMoneyLogs;
-        this.msgForm.userId=response.order.userId;
-        this.msgForm.followDoctorId=response.order.followDoctorId;
-        this.getlistOrderitem(this.item.orderId);
-        getOrderExpress(orderId).then(response => {
-          this.deliverList = response.data;
-          console.log(this.deliverList)
-        });
 
-        getOrderPayments(this.item.orderId).then(response => {
-          this.payments = response.payments;
-        });
+          this.item = response.order;
+          console.log("this.item",this.item)
+          this.tuiMoneyLogs = response.tuiMoneyLogs;
+          this.msgForm.userId=response.order.userId;
+          this.msgForm.followDoctorId=response.order.followDoctorId;
+          this.getlistOrderitem(this.item.orderId);
+          getOrderExpress(orderId).then(response => {
+            this.deliverList = response.data;
+            console.log("this.deliverList",this.deliverList)
+          });
 
-        getOrderLog(this.item.orderId).then(response => {
-          this.logs = response.logs
-        });
+          getOrderPayments(this.item.orderId).then(response => {
+            this.payments = response.payments;
+          });
 
-        tuiMoneyLogs(this.item.orderId).then(response => {
-          this.tuiMoneyLogs = response.data
-        })
-        this.afterSales = response.afterSales;
-      });
+          getOrderLog(this.item.orderId).then(response => {
+            this.logs = response.logs
+          });
+
+          tuiMoneyLogs(this.item.orderId).then(response => {
+            this.tuiMoneyLogs = response.data
+          })
+          this.afterSales = response.afterSales;
+        });
 
     },
     getOrder(){