Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/Login2019.vue

@@ -171,16 +171,16 @@
             <div class="pwd_bline_left" :class="pwd_bline==true?'_bline_w':''"></div>
             <div class="pwd_bline_right" :class="pwd_bline==true?'_bline_w':''"></div>
           </div>
-          <div class="login-commonBotm">
+          <!-- <div class="login-commonBotm">
             <i class="icon-login-password iconfont icon-mima" :style="{color: pwd_bline==true?'#E95252':'#000000'}"></i>
             <input class="input FPF_b" @focus="pwd_bline=true" @blur="pwd_bline=false" autocomplete="new-password"
               maxlength="20" v-model="passwordSure" style="background-color:transparent !important" type="password"
               placeholder="确认密码：大写字母+小写字母+数字或?!&$%#_" />
             <div class="pwd_bline_left" :class="pwd_bline==true?'_bline_w':''"></div>
             <div class="pwd_bline_right" :class="pwd_bline==true?'_bline_w':''"></div>
-          </div>
+          </div> -->
 
-          <!-- <div class="login-commonBotm btValidate">
+          <div class="login-commonBotm btValidate">
             <i class="icon-login-password iconfont icon-yanzhengma"
               :style="{color: validate_bline==true?'#E95252':'#000000'}"></i>
             <input class="input FPF_b phoneValidate" maxlength="4" onkeyup="value=value.replace(/[^\d]/g,'')"
@@ -192,7 +192,7 @@
               <span v-show="show" @click="getCode" class="FPF_s">获取验证码</span>
               <span v-show="!show" class="count FPF_s">{{count}}s重新获取</span>
             </div>
-          </div> -->
+          </div> 
           <div class="forgetPw">
             <div class="error-msg" style="float:left;width:auto;">
               <div v-show="passwordIsShow"><img src="../assets/img/login-error-tips.png" />{{ passwordErrorMsg }}</div>
@@ -341,6 +341,12 @@
               this.$cookie.set("RB_Group_id", userData.RB_Group_id);
               localStorage.menu = JSON.stringify(firstTire)
               this.loginState = 0;
+              if(!jsonData.data.IsExactness) {
+              this.$router.push({
+                path: "/resetPassword"
+              });
+                return
+              }
               this.$router.push({
                 path: "/personalCenter"
               });
@@ -446,16 +452,13 @@
         this.mobileCodeType = 2;
       },
       changePwd() {
-        if (this.passwordSure != this.password) {
-          this.Error('新密码和确认密码不一致');
-          return;
-        }
+        
         let msg = {
           password: this.password,
-          mobileNumber: this.mobileNumber
-         // code: this.code
+          mobileNumber: this.mobileNumber,
+          code: this.code
         };
-        this.apipost("user_change_password_by_mobile", msg, res => {
+        this.apipost("user_change_password_by_mobileNumber", msg, res => {
           if (res.data.resultCode == 1) {
             this.isShow = 1;
             this.$notify.success({

src/components/TravelContractConfirm.vue

@@ -2327,8 +2327,8 @@
                   = <font>{{CtObj.C_TotalPrice}}</font>元
                 </p>
                 <p>
-                  含：景点第一道门票、<font>{{CtObj.C_IncludeRemark}}</font>午（晚）餐费、往返车费、
-                  导游服务费:<font>{{CtObj.C_IncludeFee}}</font>；
+                  含：<font>{{CtObj.C_IncludeRemark}}</font>
+                  费用:<font>{{CtObj.C_IncludeFee}}</font>；
                   不含:<font>{{CtObj.C_NonIncludeRemark}}</font>
                 </p>
                 <p>支付时间：<font>{{getDate(CtObj.C_PayDate)}}</font>

src/components/TravelContractView.vue

@@ -1648,8 +1648,8 @@
                   = <font>{{CtObj.C_TotalPrice}}</font>元。
                 </p>
                 <p>
-                  含：景点第一道门票、<font>{{CtObj.C_IncludeRemark}}</font>午（晚）餐费、往返车费、
-                  导游服务费:<font>{{CtObj.C_IncludeFee}}</font>；
+                  含：<font>{{CtObj.C_IncludeRemark}}</font>
+                  费用:<font>{{CtObj.C_IncludeFee}}</font>；
                   不含:<font>{{CtObj.C_NonIncludeRemark}}</font>。
                 </p>
                 <p>支付时间：<font>{{getDate(CtObj.C_PayDate)}}</font>。</p>

src/components/onedayTripContract.vue

@@ -726,10 +726,10 @@
               </tr>
               <tr>
                 <td>
-                  <el-form-item label="含：景点第一道门票、" style="display:inline-block;">
+                  <el-form-item label="含：" style="display:inline-block;">
                     <el-input type="text" class="w150" v-model="CtObj.C_IncludeRemark"></el-input>
                   </el-form-item>
-                  <el-form-item label="午(晚)餐费、往返车费、导游服务费" label-width="250px" style="display:inline-block;">
+                  <el-form-item label="费用" label-width="250px" style="display:inline-block;">
                     <el-input type="text" class="w150" @keyup.native="checkPrice(CtObj,'C_IncludeFee')"
                       v-model="CtObj.C_IncludeFee"></el-input>
                   </el-form-item>

src/components/orderCommon/order-form.vue

@@ -61,7 +61,7 @@
                 addMsg.CustomerType == 2 ||
                 addMsg.CustomerType == ''
               ">
-            <el-select v-model="addMsg.CustomerId" filterable :placeholder="$t('pub.pleaseSel')" @change="getSspt">
+            <el-select v-model="addMsg.CustomerId" filterable :placeholder="$t('pub.pleaseSel')" @change="changeCustomer">
               <el-option v-for="item in customerList" :label="item.customerName + '-' + item.contact"
                 :value="item.customerId" :key="item.customerId">
               </el-option>
@@ -1573,8 +1573,7 @@
             if (res.data.resultCode == 1) {
               this.ScenicRefundList = res.data.data;
               this.ScenicRefundList.forEach((item) => {
-                item["ScenicName"] =
-                  item.CouponsName + " -￥" + this.moneyFormat(item.RefundMoney);
+                item["ScenicName"] = item.CouponsName + " -￥" + this.moneyFormat(item.RefundMoney);
               });
             }
           },
@@ -1592,7 +1591,7 @@
         );
       },
       //客户品牌
-      getSspt() {
+      changeCustomer() {
         //给非直客  隐藏电话姓名赋值
         let obj = this.customerList.find(
           (item) => item.customerId == this.addMsg.CustomerId

src/plug/index.js

@@ -119,8 +119,8 @@ export default {
         let crmUrl = ""; //crm API
         let locationName = window.location.hostname;
         // domainUrl = "http://192.168.10.128";
-        domainUrl = "http://192.168.10.9:8083" // 刘东电脑
-        //  domainUrl = "http://192.168.10.206:8015";
+        // domainUrl = "http://192.168.10.9:8083" // 刘东电脑
+         domainUrl = "http://192.168.10.226:8015";
         // domainUrl = "http://reborn.oytour.com";
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";

src/router/config.js

@@ -18,6 +18,15 @@ export default {
       component: login
     },
 
+    {
+      path: '/resetPassword',
+      name: 'resetPassword',
+      component: resolve => require(['@/components/resetPassword'], resolve),
+      meta: {
+        title: '修改密码'
+      },
+    },
+
     {
       path: '/leaderPrint', //领队用款计划
       name: 'leaderPrint',