Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_scrm_adminUI

.env.prod-test

@@ -0,0 +1,33 @@
+# 页面标题
+VUE_APP_TITLE =互联网医院管理系统
+# 公司名称
+COMPANY_NAME =重庆云联融智科技有限公司
+# ICP备案号
+ICP_RECORD =蜀ICP备2023036719号
+# ICP网站访问地址
+ICP_URL =https://beian.miit.gov.cn
+# 网站LOG
+VUE_APP_LOG_URL =@/assets/logo/logo.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 = hzyy-1323137866
+# 存储桶配置
+VUE_APP_COS_BUCKET = ap-chongqing
+# 线路一地址
+VUE_APP_COS_REGION = https://hzyytcpv.ylrzcloud.com
+# 线路二地址
+VUE_APP_VIDEO_LINE_1 = https://hzyyobs.ylrztop.com
+
+# 生产环境配置
+ENV = 'production'
+
+#FS管理系统/生产环境
+VUE_APP_BASE_API = '/prod-api'
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true

package.json

@@ -8,6 +8,7 @@
     "dev": "vue-cli-service serve",
     "build:prod": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
+    "build:prod-test": "vue-cli-service build --mode prod-test",
     "build:prod-jz": "vue-cli-service build --mode prod-jz",
     "build:prod-zkzh": "vue-cli-service build --mode prod-zkzh",
     "build:prod-fby": "vue-cli-service build --mode prod-fby",

src/router/index.js

@@ -120,27 +120,27 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '/qw/sopTempe',
+    path: '/course/sopTempe',
     component: Layout,
     hidden: true,
     children: [
       {
         path: 'updateSopTemp/:id/:type(\\d+)', // 确保 :type 的正则匹配数字
-        component: (resolve) => require(['@/views/qw/sopTemp/updateSopTemp'], resolve),
+        component: () => import('@/views/qw/sopTemp/updateSopTemp'),
         name: 'updateSopTemp',
-        meta: { title: '改动SOP模板', activeMenu: '/qw/addSopTemp' }
+        meta: { title: '改动SOP模板', activeMenu: '/course/addSopTemp' }
       },
       {
         path: 'updateTemp/:id/:type(\\d+)', // 确保 :type 的正则匹配数字
         component: () => import('@/views/qw/sopTemp/updateTemp'),
         name: 'updateTemp',
-        meta: { title: '改动SOP模板', activeMenu: '/qw/updateTemp' }
+        meta: { title: '改动SOP模板', activeMenu: '/course/updateTemp' }
       },
       {
         path: 'updateAiChatTemp/:id/:type(\\d+)', // 确保 :type 的正则匹配数字
         component: () => import('@/views/qw/sopTemp/updateAiChatTemp'),
         name: 'updateAiChatTemp',
-        meta: { title: '改动SOP模板', activeMenu: '/qw/addSopTemp' }
+        meta: { title: '改动SOP模板', activeMenu: '/course/addSopTemp' }
       }
     ]
   },

src/settings.js

@@ -1,5 +1,5 @@
 module.exports = {
-  title: '果雨管理总后台',
+  title: 'SCRM管理总后台',
 
 
 

src/views/components/course/userCourseCatalogDetails.vue

@@ -78,6 +78,24 @@
               {{ formatDuration(row.duration) }}
           </template>
       </el-table-column>
+      <el-table-column label="看课开始时间" align="center" prop="duration">
+        <template slot-scope="{ row }">
+          <el-tag v-if="row.viewStartTime">{{row.viewStartTime}}</el-tag>
+          <el-tag type="danger" v-if="!row.viewStartTime">无</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="看课结束时间" align="center" prop="duration">
+        <template slot-scope="{ row }">
+          <el-tag v-if="row.viewEndTime">{{row.viewEndTime}}</el-tag>
+          <el-tag type="danger" v-if="!row.viewEndTime">无</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="领取红包时间" align="center" prop="duration">
+        <template slot-scope="{ row }">
+          <el-tag v-if="row.lastJoinTime">{{ row.lastJoinTime }}</el-tag>
+          <el-tag type="danger" v-if="!row.lastJoinTime">无</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="红包金额" align="center" prop="redPacketMoney" v-if="isPrivate === 1"/>
       <el-table-column label="排序" align="center" prop="courseSort" />
       <el-table-column label="上传时间" align="center" prop="createTime" />
@@ -804,6 +822,7 @@ export default {
       batchRedSave(){
         batchUpdateRed(this.redData.list).then(response => {
           this.redData.open = false;
+          this.getList();
         })
       },
     }

src/views/index.vue

@@ -191,7 +191,7 @@
 
         <div class="action-group">
           <el-radio-group v-model="userTypeText" @change="handleUserType">
-            <el-radio-button label="个微"></el-radio-button>
+            <el-radio-button label="会员"></el-radio-button>
             <el-radio-button label="企微"></el-radio-button>
           </el-radio-group>
 
@@ -326,7 +326,7 @@
                   <span>完播人数</span>
                 </div>
               </div>
-              <el-button size="small" plain class="view-more">平台每日统计 <i class="el-icon-arrow-right"></i></el-button>
+<!--              <el-button size="small" plain class="view-more">平台每日统计 <i class="el-icon-arrow-right"></i></el-button>-->
             </div>
             <div ref="viewerChart" class="chart-container"></div>
           </el-card>
@@ -342,7 +342,7 @@
                   <el-radio-button label="1">按完播人数</el-radio-button>
                 </el-radio-group>
               </div>
-              <el-button size="small" plain class="view-more">经销商统计 <i class="el-icon-arrow-right"></i></el-button>
+<!--              <el-button size="small" plain class="view-more">经销商统计 <i class="el-icon-arrow-right"></i></el-button>-->
             </div>
             <div ref="dealerChart" class="chart-container"></div>
           </el-card>
@@ -386,7 +386,7 @@
                 <span>正确人数</span>
               </div>
             </div>
-            <el-button size="small" plain class="view-more">经销商统计 <i class="el-icon-arrow-right"></i></el-button>
+<!--            <el-button size="small" plain class="view-more">经销商统计 <i class="el-icon-arrow-right"></i></el-button>-->
           </div>
           <div ref="courseWatchChart" class="chart-container"></div>
         </el-card>
@@ -405,7 +405,7 @@
                   <el-radio-button label="1">按课程排行</el-radio-button>
                 </el-radio-group>
               </div>
-              <el-button size="small" plain class="view-more">红包记录 <i class="el-icon-arrow-right"></i></el-button>
+<!--              <el-button size="small" plain class="view-more">红包记录 <i class="el-icon-arrow-right"></i></el-button>-->
             </div>
             <div ref="answerRedPackViewerChart" class="chart-container"></div>
           </el-card>
@@ -420,7 +420,7 @@
                   <span>答题红包金额</span>
                 </div>
               </div>
-              <el-button size="small" plain class="view-more">红包记录 <i class="el-icon-arrow-right"></i></el-button>
+<!--              <el-button size="small" plain class="view-more">红包记录 <i class="el-icon-arrow-right"></i></el-button>-->
             </div>
             <div ref="answerRedPackMoneyViewerChart" class="chart-container"></div>
           </el-card>

src/views/qw/sopTemp/index.vue

@@ -504,7 +504,7 @@ export default {
       // if (row.sendType==4) {
       //   this.$router.push(`/qw/sopTemp/updateAiChatTemp/${row.id}/3`)
       // }else{
-      this.$router.push(`/qw/sopTempe/updateSopTemp/${row.id}/3`)
+      this.$router.push(`/course/sopTempe/updateSopTemp/${row.id}/3`)
       // }
     },
     /** 修改按钮操作 */
@@ -522,7 +522,7 @@ export default {
       // if (row.sendType==4) {
       //   this.$router.push(`/qw/sopTemp/updateAiChatTemp/${row.id}/1`)
       // }else{
-      let url = `/qw/sopTempe/updateSopTemp/${row.id}/1`;
+      let url = `/course/sopTempe/updateSopTemp/${row.id}/1`;
       console.info(url)
       this.$router.push(url)
       // }

src/views/user/transfer/index.vue

@@ -103,7 +103,7 @@
       <el-table-column label="所属公司" align="center" prop="companyName" />
       <el-table-column label="转移类型" align="center" prop="transferTypeText" />
       <el-table-column label="目标销售" align="center" prop="targetUserName" />
-      <el-table-column label="发起转移用户" align="center" prop="initiatorUserName" />
+      <el-table-column label="发起用户" align="center" prop="initiatorUserName" />
       <el-table-column label="转移内容/原因" align="center" prop="content" />
       <el-table-column label="审批状态" align="center" prop="approvalStatus" >
         <template slot-scope="scope">
@@ -111,12 +111,12 @@
         </template>
       </el-table-column>
       <el-table-column label="审批意见/备注" align="center" prop="approvalRemark" />
-      <el-table-column label="记录创建时间" align="center" prop="createdAt" width="180">
+      <el-table-column label="创建时间" align="center" prop="createdAt" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createdAt, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="记录最后更新时间" align="center" prop="updatedAt" width="180">
+      <el-table-column label="更新时间" align="center" prop="updatedAt" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updatedAt, '{y}-{m}-{d}') }}</span>
         </template>
@@ -167,13 +167,13 @@
             <el-table-column label="转移后销售" align="center" prop="afterCompanyUserName" />
           </el-table>
         </el-form-item>
-        <el-form-item label="目标接收销售用户" prop="targetUserId">
+        <el-form-item label="接收销售" prop="targetUserId">
           <el-input v-model="form.targetUserName" placeholder="请输入目标接收销售用户 ID" disabled="disabled"/>
         </el-form-item>
-        <el-form-item label="发起此转移请求的用户" prop="initiatorUserId">
+        <el-form-item label="请求用户" prop="initiatorUserId">
           <el-input v-model="form.initiatorUserName" placeholder="请输入发起此转移请求的用户 ID" disabled="disabled"/>
         </el-form-item>
-        <el-form-item label="转移提示内容/原因">
+        <el-form-item label="转移提示内容">
           <el-input v-model="form.content" :min-height="192" disabled="disabled"/>
         </el-form-item>
         <el-form-item label="审批状态">
@@ -181,7 +181,7 @@
             <el-tag>{{form.approvalStatusText}}</el-tag>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="审批意见/备注" prop="approvalRemark">
+        <el-form-item label="审批意见" prop="approvalRemark">
           <el-input v-model="form.approvalRemark" type="textarea" placeholder="请输入内容"  disabled="disabled"/>
         </el-form-item>
       </el-form>