222

config/dev.env.js

@@ -5,7 +5,7 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   ENV_CONFIG:'"dev"',
-  BASE_URL: '"http://39.98.239.48/web-api"',
-  // BASE_URL: '"http://192.168.0.111:8080/"' //测试服务器
+  // BASE_URL: '"http://39.98.239.48/web-api"',
+  BASE_URL: '"http://192.168.0.115:8080/"' //测试服务器
 
 })

src/App.vue

@@ -1,8 +1,8 @@
 <template>
   <div id="app">
     <router-view v-if="isRouterAlive" />
-    <el-backtop :bottom="80" :right="60" :visibility-height="1100">
-      <div ><i class="el-icon-caret-top" style="color:#ee7000;"></i></div>
+    <el-backtop :bottom="16" :right="60" :visibility-height="1100" class="backtop">
+      <div><i class="el-icon-caret-top" style="color:#ee7000;"></i></div>
     </el-backtop>
   </div>
 </template>
@@ -39,4 +39,26 @@ export default {
   fill: currentColor;
   overflow: hidden;
 }
+
+.backtop {
+  position: fixed;
+  background-color: #FFF;
+  width: 40px;
+  height: 40px;
+  border-radius: 50%;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-box-pack: center;
+  -ms-flex-pack: center;
+  justify-content: center;
+  font-size: 20px;
+  -webkit-box-shadow: 0 0 6px rgba(0, 0, 0, .12);
+  box-shadow: 0 0 6px rgba(0, 0, 0, .12);
+  cursor: pointer;
+  z-index: 999;
+}
 </style>

src/config/global.js

@@ -6,12 +6,12 @@
 
 // 后台管理系统服务器地址
 export const baseUrl = 'http://192.168.0.115:8080'
-export const h5BaseUrl = 'http://192.168.0.115:8091'
-    
+// export const h5BaseUrl = 'http://192.168.0.115:8091'
+
 //旧服务器
-// export const baseUrl = 'http://test.baoxianzhanggui.com:8080'  
+// export const baseUrl = 'http://test.baoxianzhanggui.com:8080'
 // export const h5BaseUrl = 'http://test.baoxianzhanggui.com:8091'  // h5测试
-// export const baseUrl = 'http://www.baoxianzhanggui.com:8080'   
+// export const baseUrl = 'http://www.baoxianzhanggui.com:8080'
 // 新服务器
 // export const baseUrl = 'http://39.98.239.48/web-api' //测试服务器
 // export const baseUrl = 'http://192.168.0.111:8080' //测试服务器
@@ -21,7 +21,7 @@ export const h5BaseUrl = 'http://192.168.0.115:8091'
 // export const h5BaseUrl = 'http://39.98.239.48/h5'  //h5测试
 
 // export const baseUrl = 'http://sxzgkj.baoxianzhanggui.com/web-api' //正式服务器
-// export const h5BaseUrl = 'http://sxzgkj.baoxianzhanggui.com/h5'  //h5正式
+export const h5BaseUrl = 'http://sxzgkj.baoxianzhanggui.com/h5'  //h5正式
 //保险公司名称
 export const insCompanyList = [
   { name: "华农财险", code: "huanong", icon: "../../static/image/company/huanong.png" },//华农

src/main.js

@@ -32,7 +32,7 @@ Vue.use(Viewer, {
     loading: false
   }
 })
-ElementUI.Dialog.props.lockScroll.default = false;
+// ElementUI.Dialog.props.lockScroll.default = false;
 Vue.config.productionTip = false;
 //预览图片End
 Vue.use(VueDirectiveWindow);

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -93,8 +93,9 @@
             label-width="130px">
             <el-row>
               <el-col :span="12">
-                <el-form-item label="协议代码" prop="agreementCode">
-                  <el-input v-model="agreement.agreementCode" placeholder="请输入协议代码" style="width: 100%;"></el-input>
+                <el-form-item label="协议代码">
+                  <el-input v-model="agreement.agreementCode" disabled placeholder="请输入协议代码"
+                    style="width: 100%;"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -222,7 +223,7 @@
               <i class="el-icon-s-operation"></i> 其他产品费用</el-button> -->
           </div>
           <div>
-            <el-form ref="costform" :model="costform" label-width="100px" :size="overSize">
+            <el-form ref="costform" :model="costform" label-width="100px" :size="overSize" :rules="costformRules">
               <div class="flex   f-c products" v-for="(schemeitem, schemeindex) in costform.scheme" :key="schemeindex">
                 <div class="productstitle flex j-s">
                   <div><span>{{ schemeitem.name }}费用</span></div>
@@ -260,21 +261,24 @@
                       </el-form-item>
                     </el-col>
                     <el-col :span="10">
-                      <el-form-item label="费用级别">
-                        <el-input v-model="productCostsitem.costsLevel" placeholder="请输入费用级别"></el-input>
+                      <el-form-item label="费用级别" prop="costsLevel">
+                        <el-select v-model="productCostsitem.costsLevel" placeholder="请选择费用级别" style="width: 100%;">
+                          <el-option label="常规" value="1"></el-option>
+                          <el-option label="默认" value="2"></el-option>
+                          <el-option label="优先级最高" value="3"></el-option>
+                        </el-select>
                       </el-form-item>
                     </el-col>
                     <el-col :span="10" :offset="2">
                       <el-form-item label="费用起期">
-
-                        <el-date-picker style="width: 100%;" v-model="productCostsitem.costsStartDate" type="date"
+                        <el-date-picker style="width: 100%;" v-model="productCostsitem.costsStartDate" type="datetime"
                           placeholder="选择费用开始日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
                         </el-date-picker>
                       </el-form-item>
                     </el-col>
                     <el-col :span="10">
                       <el-form-item label="费用止期">
-                        <el-date-picker style="width: 100%;" v-model="productCostsitem.costsEndDate" type="date"
+                        <el-date-picker style="width: 100%;" v-model="productCostsitem.costsEndDate" type="datetime"
                           placeholder="选择费用结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
                         </el-date-picker>
                       </el-form-item>
@@ -1859,7 +1863,6 @@ export default {
       columns: [
         //数据列
         { prop: "id", label: "编号", minWidth: 180 },
-        { prop: "agreementCode", label: "协议代码", minWidth: 130 },
         { prop: "agreementName", label: "协议名称", minWidth: 200 },
         {
           prop: "agreementType",
@@ -1955,7 +1958,11 @@ export default {
           { required: true, message: "请选择", trigger: "blur" },
         ],
       },
-
+      costformRules: {
+        costsLevel: [
+          { required: true, message: "请选择费用级别", trigger: "blur" },
+        ],
+      },
       //------------协议下拉框数据   begin-----------------
       agreementTypeoptions: [], //协议类型
       channeloptions: [], //合作渠道

src/views/Core/PersonalPanel.vue

@@ -126,12 +126,12 @@ export default {
       // }
   },
   methods: {
-   
+
     //闪电增员
     recruiting() {
         this.$refs.recruitingDialog.setBackupVisible(true)
     },
-  
+
     // 退出登录
     logout: function () {
       this.$confirm("确认退出吗?", "提示", {
@@ -195,12 +195,10 @@ export default {
   background: rgba(182, 172, 172, 0.1);
   margin: -14px;
 }
-
 .personal-desc {
   padding: 15px;
   color: #fff;
 }
-
 .avatar {
   width: 80px;
   height: 80px;
@@ -231,7 +229,6 @@ export default {
 .main-operation {
   padding: 8px;
   margin-right: 1px;
-  /* background: rgba(175, 182, 179, 0.3); */
   border-color: rgba(201, 206, 206, 0.2);
   border-top-width: 1px;
   border-top-style: solid;

src/views/HeadBar/HeadBar.vue

@@ -133,12 +133,12 @@ export default {
       }
     if(!JSON.parse(localStorage.getItem('user_data'))){
       this.$api.user.getLoginUser().then((response) => {
-          this.userData=response.data 
+          this.userData=response.data
       })
     }
     if (this.leftNavItems.length > 8) {
       if (this.screenWidth < this.datawidth) {
-        this.sum = Math.ceil((this.datawidth - this.screenWidth) / 70)
+        this.sum = Math.ceil((this.datawidth - this.screenWidth) / 60)
         // 为了避免频繁触发resize函数导致页面卡顿，使用定时器
         if (!this.timer) {
           // 一旦监听到的screenWidth值改变，就将其重新赋给data里的screenWidth
@@ -159,7 +159,7 @@ export default {
       }
     },
     screenWidth(newValue) {
-        this.sum = Math.ceil((this.datawidth - newValue) / 70)
+        this.sum = Math.ceil((this.datawidth - newValue) / 60)
         // 为了避免频繁触发resize函数导致页面卡顿，使用定时器
         if (!this.timer) {
           // 一旦监听到的screenWidth值改变，就将其重新赋给data里的screenWidth
@@ -168,7 +168,7 @@ export default {
           setTimeout(() => {
             this.timer = false;
           }, 400);
-          
+
         }
 
     }
@@ -180,8 +180,8 @@ export default {
     }
     this.sysName = "Zgdd Platform";
     // var user = sessionStorage.getItem("user")
-  
-      
+
+
     // if (user) {
     //   this.user.id = user;
     //   this.$api.user.findById(user).then((personRes) => {
@@ -218,7 +218,7 @@ export default {
       //切换左侧菜单
       this.$store.commit('changeLeftTree', key);
       localStorage.setItem('routerId', key) // 保存用户到本地会话
-      
+
     },
     // 折叠导航栏
     onCollapse: function () {

src/views/Letter/Letter.vue

@@ -1394,7 +1394,10 @@
         </div>
       </el-card>
     </el-dialog>
-    <div class="footer flex j-c a-c">
+    <div class=" flex j-c a-c" :class="{
+      'footer': true,
+      'shadow': !isBottom
+    }">
       <el-button size="small" @click="add()">录下一单</el-button>
       <el-button type="warning" size="small" @click="quote()">保费计算</el-button>
     </div>
@@ -2316,7 +2319,8 @@ export default {
       image2: "",
       radio: 99,
       sumseatCount: "", // 投保险种座位数
-      deptName: ""
+      deptName: "",
+      isBottom: true,
     };
   },
   watch: {
@@ -2437,8 +2441,28 @@ export default {
       this.syendDate = this.oneYearPast(this.systartDate);
     }
   },
+  mounted() {
+    this.onScroll()
+    window.addEventListener('scroll', this.onScroll)
+  },
+  destroyed() {
+    window.removeEventListener('scroll', this.onScroll)
+  },
   methods: {
-
+    onScroll() {
+      // 变量scrollTop是滚动条滚动时，滚动条上端距离顶部的距离
+      var scrollTop = document.documentElement.scrollTop || document.body.scrollTop
+      // 变量windowHeight是可视区的高度
+      var windowHeight = document.documentElement.clientHeight || document.body.clientHeight
+      // 变量scrollHeight是滚动条的总高度（当前可滚动的页面的总高度）
+      var scrollHeight = document.documentElement.scrollHeight || document.body.scrollHeight
+      // 滚动条到底部
+      if (Math.ceil(scrollTop + windowHeight) >= scrollHeight) {
+        this.isBottom = true
+      } else {
+        this.isBottom = false
+      }
+    },
     // 选择意外险类型
     async ywxxxchange(index) {
       this.accidentForm = Object.assign(
@@ -2531,7 +2555,6 @@ export default {
           ele["msg"] = "";
           ele["agreementId"] = "";
           ele["apiType"] = "";
-
         });
         this.totalCompanyList = res.data;
       });
@@ -5050,9 +5073,14 @@ export default {
   right: 0;
   background-color: #fff;
   z-index: 9;
-  padding: 6px;
+  padding: 20px;
   box-sizing: border-box;
-  box-shadow: rgb(221, 221, 221) 0px -1px 0px 0px;
+  box-shadow: 0 0 1px 0 #ccc;
+  transition: all 0.3s, box-shadow 0.5s;
+
+  &.shadow {
+    box-shadow: 0 -10px 10px -10px #ccc;
+  }
 }
 
 .Enclosure {
@@ -5079,8 +5107,9 @@ export default {
   box-shadow: #ccc 0 0px 3px 0;
   border-radius: 6px;
   position: fixed;
-  bottom: 60px;
-  right: 10px;
+  top: 50%;
+  right: 0;
+  z-index: 99;
 
   div {
     margin: 5px;