修改登录

src/components/FreeTravel/FreeList.vue

@@ -997,6 +997,14 @@ export default {
             let deleteIdiot = []
             data.map(x=>{
               if(x.Country_Name !== "台湾" && x.Country_Name !== "香港" && x.Country_Name !== "澳门" && x.Country_Name !== "港澳") {
+                x.Cities.map(y=>{
+                  if(y.City_Name == "渖阳") {
+                    y.City_Name = "沈阳"
+                  }
+                  if(y.City_Name == "所有城市") {
+                    y.City_Name == ""
+                  }
+                })
                 deleteIdiot.push(x)
               }
             })

src/components/FreeTravel/FreeList2.vue

@@ -428,6 +428,45 @@
   box-shadow:0px 4px 10px 0px rgba(0, 0, 0, 0.24);
   margin-bottom: 25px;
 }
+.tianqi-box{
+  width: 221px;
+  position: relative;
+  z-index: 2;
+  height: 150px;
+}
+.today-tq{
+  width: 221px;
+  height: 106px;
+  background: url(../../assets/img/freeHome/tianqi1.png);
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  padding: 30px 0px 0 20px;
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+}
+.today-tq img{
+  width: 54px;
+  margin-right:10px;
+}
+
+.today-tq2{
+  width: 275px;
+  height: initial !important;
+  background: url(../../assets/img/freeHome/tianqibg.png);
+  /* background-size: 100% 100%; */
+  background-repeat: no-repeat;
+  padding: 33px 33px 0 50px;
+  box-sizing: border-box;
+  display: block;
+  position: relative;
+  left: -30px;
+}
+.tianqi-item{
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
 </style>
 <template>
   <div class="freeList2 commonF">
@@ -467,8 +506,28 @@
           </div>
         </div>
         <!-- 天气 -->
-        <div>
-          
+        <div class="tianqi-box" @mouseover="tianqiShow = true" @mouseout="tianqiShow = false" v-if="weatherList.length>0">
+          <div v-if="!tianqiShow" class="today-tq">
+            <img :src="require('@/assets/img/weather/'+ weatherList[0].cond_code_d +'.png')" alt="">
+            <div class="f16 cff">
+              <p class="PingFangR">{{weatherList[0].tmp_min}}℃-{{weatherList[0].tmp_max}}℃</p>
+              <p class="f14">{{weatherList[0].cond_txt_d}}，{{weatherList[0].date.substring(5, 7)}}月{{weatherList[0].date.substring(8, 10)}}日</p>
+            </div>
+          </div>
+          <div v-else class="today-tq today-tq2">
+            <div class="tianqi-item" v-for="(item, index) in weatherList" >
+              <img :src="require('@/assets/img/weather/'+ item.cond_code_d +'.png')" alt="">
+              <div class="f16 c33">
+                <p class="PingFangR">{{item.tmp_min}}℃-{{item.tmp_max}}℃</p>
+                <p class="f14">{{item.cond_txt_d}}，{{item.date.substring(5, 7)}}月{{item.date.substring(8, 10)}}日</p>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="tianqi-box"  v-else>
+          <div v-if="!tianqiShow" class="today-tq cff">
+            暂无该城市天气
+          </div>
         </div>
         <div class="contet-nav">
           <div @click="goHome">
@@ -601,6 +660,7 @@
 export default {
    data () {
     return {
+      tianqiShow: false,
       defaultImg: 'this.src="' + require('assets/img/juan/error.png') + '"',
       ccIdNew: null,
       newCityCheck: [],
@@ -817,7 +877,8 @@ export default {
             checkd: false,
           },
         ]
-      }]
+      }],
+      weatherList: [],
     }
   },
   mounted() {
@@ -840,8 +901,26 @@ export default {
     }
     this.getList()
     this.getCCList(1)
+    this.getCCWeather()
   },
   methods: {
+    //获取天气
+    getCCWeather(t){
+      // http://efficient.oytour.com/api/kkday/Weather
+      this.apiJavaPost(
+        "/api/kkday/Weather",
+        {city: this.ccName},
+        res => {
+          if (res.data.resultCode === 1) {
+            console.log(res)
+            this.weatherList = res.data.data.HeWeather6[0].daily_forecast
+          } else {
+            this.Error(res.data.message);
+          }
+        },
+        null
+      );
+    },
     changeDate(){
       let date = this.value ? this.value : ""
       console.log(this.value)
@@ -954,7 +1033,7 @@ export default {
         this.ccName = name;
         this.getList(2, id)
       }
-      
+      this.getCCWeather()
     },
     // 获取列表
     getList(type, id){
@@ -1003,6 +1082,14 @@ export default {
             let deleteIdiot = []
             data.map(x=>{
               if(x.Country_Name !== "台湾" && x.Country_Name !== "香港" && x.Country_Name !== "澳门" && x.Country_Name !== "港澳") {
+                x.Cities.map(y=>{
+                  if(y.City_Name == "渖阳") {
+                    y.City_Name = "沈阳"
+                  }
+                  if(y.City_Name == "所有城市") {
+                    y.City_Name == ""
+                  }
+                })
                 deleteIdiot.push(x)
               }
             })

src/components/newPersonalCenter/block/MyCoupon.vue

@@ -17,6 +17,7 @@
               </span>
             </span>
             <el-dropdown-menu class="changelanguage" slot="dropdown">
+              <el-dropdown-item @click.native="dropdownText = '不限', msg.couponsUseScope = 0, getList(), resetPageIndex()">不限</el-dropdown-item>
               <el-dropdown-item @click.native="dropdownText = '通用', msg.couponsUseScope = 1, getList(), resetPageIndex()">通用</el-dropdown-item>
               <el-dropdown-item @click.native="dropdownText = '跟团游', msg.couponsUseScope = 2, getList(), resetPageIndex()">跟团游</el-dropdown-item>
               <el-dropdown-item @click.native="dropdownText = '当地游'">当地游</el-dropdown-item>
@@ -121,7 +122,7 @@ export default {
   },
   data() {
     return {
-      dropdownText: "通用",
+      dropdownText: "不限",
       typeActive: 1,
       totalCount: 1,
       pageSize: 1,
@@ -135,7 +136,7 @@ export default {
         couponsType: "",
         couponStatus: 1,
         couponEffectStatus: 1,
-        couponsUseScope: 1
+        couponsUseScope: 0
       },
       dataList: [],
       dataLoading: false,

src/views/login.vue

@@ -78,7 +78,7 @@
                         v-model="activeMsg.account"
                         clearable>
                     </el-input>
-                     <p class="title passwdP"><span class="iconfont icon-mima1"></span>密码</p>                    
+                     <p class="title passwdP"><span class="iconfont icon-mima1"></span>设置密码</p>
                     <el-input 
                         placeholder="密码"
                         v-model="activeMsg.password"

src/views/newLogin.vue

@@ -57,8 +57,8 @@
 }
 .new_login .active_code .el-button{
   border: none;
-  border-left: 1px solid #CCCCCC;
-  border-radius: 0;
+  color: #66b1ff;
+  text-align: right;
 }
 .new_login .el-input--suffix .el-input__inner{
   border-bottom: none !important;
@@ -77,8 +77,15 @@
   background-image: none;
   transition: background-color 50000s ease-in-out 0s;
 }
+.bg-gray,.new_login .active_code .el-button.bg-gray:hover{
+  color: #999999 !important
+}
+.login_pass p:hover{
+  color: #111111;
+}
 .new_login .login_pass {
   color: #999999;
+   color: #111111;
 }
 .new_login .el-button.is-round {
   padding: 15px 70px;
@@ -170,7 +177,7 @@
             ></el-input>
           </el-form-item>
           <p class="_lable">
-            <i class="iconfont icon-mima1"></i> 密码
+            <i class="iconfont icon-mima1"></i> 设置密码
           </p>
           <el-form-item prop="password">
             <el-input
@@ -190,7 +197,7 @@
                 clearable>
             </el-input>
             <el-button v-if="show"  @click="getCode">{{timer==null?'发送验证码':timer}}</el-button>
-            <el-button v-else disabled>{{count}}s重新获取</el-button>
+            <el-button v-else disabled class="bg-gray">{{count}}s重新获取</el-button>
           </div>
           <div class="login_pass">
             <p @click="active = false, initMsg()">返回登录</p>
@@ -309,9 +316,14 @@ export default {
               cancelButtonText: "等一等",
               type: "warning"
             })
-              .then(() => {})
-              .catch(() => {});
+              .then(() => {
+                this.active = true;
+              })
+              .catch(() => {
+
+              });
           } else if (r.data.resultCode == 1) {
+
           } else {
             this.$message.error(r.data.message);
           }