浏览代码

添加觉大版本内容校验

wangtao 3 周之前
父节点
当前提交
1f23b0715d
共有 4 个文件被更改,包括 35 次插入20 次删除
  1. 0 6
      README.md
  2. 2 2
      src/pages.json
  3. 19 9
      src/pages/business/fireIot/repairReport/index.vue
  4. 14 3
      src/pages/business/fireIot/repairReport/record.vue

+ 0 - 6
README.md

@@ -7,9 +7,3 @@
 ## node>18.1.0||16.17.1
  
 ##### 提交时执行 npm run update:setting "zhiHuiYun",防止每次文件变更
-
-
-## 觉大版本
-  1.关闭报修申请页面的报修历史(调整为历史记录)记录功能(注:短信通知模本未解决情况下)
-  2.报修申请菜单改为售后服务
-  3.报修申请页面 内容中(报修人改为填报人、问题描述改为描述)

+ 2 - 2
src/pages.json

@@ -771,14 +771,14 @@
                 {
                     "path": "repairReport/index",
                     "style": {
-                        "navigationBarTitleText": "报修申请",
+                        "navigationBarTitleText": "",
                         "enablePullDownRefresh": false
                     }
                 },
                 {
                     "path": "repairReport/record",
                     "style": {
-                        "navigationBarTitleText": "报修历史",
+                        "navigationBarTitleText": "",
                         "enablePullDownRefresh": false
                     }
                 }

+ 19 - 9
src/pages/business/fireIot/repairReport/index.vue

@@ -14,7 +14,8 @@
       <view class="list-cell">
         <view class="menu-item font14">
           <view style="margin-right: auto; color: #666666"></view>
-          <view style="color: #149eff" @click="proxy.$tab.navigateTo(`/pages/business/fireIot/repairReport/record`)">报修历史</view>
+          <!-- <view style="color: #149eff" @click="proxy.$tab.navigateTo(`/pages/business/fireIot/repairReport/record`)" v-if="jd">历史记录</view> -->
+          <view style="color: #149eff" @click="proxy.$tab.navigateTo(`/pages/business/fireIot/repairReport/record`)" v-if="!jd">报修历史</view>
         </view>
 
         <u--form :model="form" ref="uForm" :rules="rules" labelWidth="80">
@@ -30,14 +31,14 @@
               <u-form-item label="项目地址" prop="projectAddress" :borderBottom="true" required>
                 <u-input v-model="form.projectAddress" placeholder="请填写项目地址" border="none" />
               </u-form-item>
-              <u-form-item label="报修人" prop="reflectName" :borderBottom="true" required>
-                <u-input v-model="form.reflectName" placeholder="请填写报修人" border="none" maxlength="10" />
+              <u-form-item :label="jd ? '填报人' : '报修人'" prop="reflectName" :borderBottom="true" required>
+                <u-input v-model="form.reflectName" :placeholder=" jd ? '请填写填报人' : '请填写报修人'" border="none" maxlength="10" />
               </u-form-item>
               <u-form-item label="手机号" prop="reflectPhone" :borderBottom="true" required>
                 <u-input v-model="form.reflectPhone" placeholder="请填写手机号" border="none" maxlength="11" />
               </u-form-item>
-              <u-form-item label="问题描述" prop="repairContent" :borderBottom="true" required>
-                <u--textarea v-model="form.repairContent" border="none" placeholder="请填写问题描述" maxlength="100" style="padding: 0"></u--textarea>
+              <u-form-item :label="jd ? '描述' : '问题描述'" prop="repairContent" :borderBottom="true" required>
+                <u--textarea v-model="form.repairContent" border="none" :placeholder="jd ? '请填写描述' : '请填写问题描述'" maxlength="100" style="padding: 0"></u--textarea>
               </u-form-item>
               <u-form-item label="上传图片" prop="repairPicture" :borderBottom="true">
                 <oa-upload :uploadCount="1" :uploadImage="form.repairPicture" @uploadSuccessChange="uploadSuccessChange" @uploadDeleteChange="uploadDeleteChange"></oa-upload>
@@ -79,12 +80,12 @@ import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue
 import { add, getAddHistoryInfo } from "@/api/business/fireIot/repairReport.js";
 /*----------------------------------组件引入-----------------------------------*/
 /*----------------------------------store引入-----------------------------------*/
-import { useStores, commonStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/
+import config from "@/config";
 /*----------------------------------公共变量-----------------------------------*/
 const { proxy } = getCurrentInstance();
-const commonStore = commonStores();
 /*----------------------------------变量声明-----------------------------------*/
+const jd = ref(config.baseUrl.indexOf("manager.juedatech.com") > -1) //觉大环境判断
 const uForm = ref(null);
 const state = reactive({
   form: {
@@ -99,12 +100,12 @@ const state = reactive({
   rules: {
     projectName: [{ required: true, message: "请填写项目名称", trigger: ["blur", "change"] }],
     projectName: [{ required: true, message: "请填写项目地址", trigger: ["blur", "change"] }],
-    reflectName: [{ required: true, message: "请填写报修人", trigger: ["blur", "change"] }],
+    reflectName: [{ required: true, message: `请填写${jd.value ? '填报人' : '报修人'}`, trigger: ["blur", "change"] }],
     reflectPhone: [
       { required: true, message: "请填写手机号", trigger: ["blur", "change"] },
       { type: "string", min: 11, required: true, message: "请填写正确11位手机号", pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, trigger: ["blur", "change"] },
     ],
-    repairContent: [{ required: true, message: "请填写问题描述", trigger: ["blur", "change"] }],
+    repairContent: [{ required: true, message: `请填写${jd.value ? '描述' : '问题描述'}`, trigger: ["blur", "change"] }],
   },
 
   actionShow: false,
@@ -200,6 +201,15 @@ onLoad((options) => {
   if ("statusBool" in options) {
     document.getElementsByClassName("uni-page-head-hd")[0].style.cssText = "display: none;";
   }
+  if(jd.value){
+    wx.setNavigationBarTitle({
+      title: "售后服务"
+    });
+  }else{
+    wx.setNavigationBarTitle({
+      title: "报修申请"
+    });
+  }
 });
 
 onReady(() => {});

+ 14 - 3
src/pages/business/fireIot/repairReport/record.vue

@@ -26,8 +26,8 @@
           </view>
           <view class="content-area-row_wrap menu-item">
             <view class="content-area-row_wrap-view"> 项目名称:{{ base.projectName }} </view>
-            <view class="content-area-row_wrap-view"> 报修人:{{ base.reflectName }} </view>
-            <view class="content-area-row_wrap-view"> 报修人电话:{{ base.reflectPhone }} </view>
+            <view class="content-area-row_wrap-view"> {{ jd ? "填报" : "报修" }}人:{{ base.reflectName }} </view>
+            <view class="content-area-row_wrap-view"> {{ jd ? "填报" : "报修" }}人电话:{{ base.reflectPhone }} </view>
             <view class="content-area-row_wrap-view"> 报修内容:{{ base.repairContent }} </view>
             <view class="content-area-row_wrap-view"> 报修地址:{{ base.projectAddress }} </view>
           </view>
@@ -44,10 +44,11 @@ import { getToken, setToken, removeToken } from "@/utils/auth";
 import { useStores, commonStores } from "@/store/modules/index";
 
 import { getHistory } from "@/api/business/fireIot/repairReport.js";
-
+import config from "@/config";
 const { proxy } = getCurrentInstance();
 const useStore = useStores();
 const commonStore = commonStores();
+const jd = ref(config.baseUrl.indexOf("manager.juedatech.com") > -1) //觉大环境判断
 
 const dataList = ref([]);
 const dataStatus = ref(false);
@@ -121,6 +122,16 @@ onLoad((options) => {
   } else {
     init();
   }
+
+  if(jd.value){
+    wx.setNavigationBarTitle({
+      title: "历史记录"
+    });
+  }else{
+    wx.setNavigationBarTitle({
+      title: "报修历史"
+    });
+  }
 });
 </script>