123

igirl-channel-web/app/front/vues/pages/jdtrademark/jdtrademark.js

@@ -244,15 +244,23 @@
           }
           break;
         case "bw":
-          if ($.cookie('userpin') && $.cookie('userpin') != "") {
+
           if (code.channelItemCode) {
             switch (code.itemCode) {
               case "zzsbzc":
+                if ($.cookie('userpin') && $.cookie('userpin') != "") {
                   this.$router.push({
                     path: `/${this.$root.channelName}/bwselftmreg`, query: {
                       sdsId: code.channelItemCode
                     }
                   });
+                } else {
+                  this.$message({
+                    type: "warning",
+                    message: "当前未登录"
+                  })
+                }
+
                 /*this.$router.push({ path: "/jd/selftmreg", query: {} });*/
                 break;
               case "fzsbzc":
@@ -273,12 +281,7 @@
               message: "没有当前产品信息"
             })
           }
-          } else {
-            this.$message({
-              type: "warning",
-              message: "当前未登录"
-            })
-          }
+
 
           break;
 

igirl-channel-web/app/front/vues/pages/login/login.html

@@ -30,14 +30,14 @@
                 <el-button id="loginCode" type="primary" plain style="width: 145px;
                 background: #128EE9;
                 color: #fff;"
-                @click="obtaincode1">
+                @click="obtaincode1" :disabled="vCodeClick">
                   获取验证码</el-button>
               </el-form-item>
               <div style="font-size:12px;color:#B2B2B2;margin-top: -4px;
               margin-left: 85px;">
                 <span style="color:#108EE9;cursor:pointer" @click="register()">没有账号？去注册</span>
-                <span style="margin:0 4px;">|</span>
-                <span style="color:#999999;cursor:pointer" @click="rsetpassword">忘记密码？</span>
+                <!-- <span style="margin:0 4px;">|</span>
+                <span style="color:#999999;cursor:pointer" @click="rsetpassword">忘记密码？</span> -->
               </div>
               <el-form-item style="margin-bottom:8px;">
                 <el-button type="primary" class="login-content-button" @click="checklogin1" style="margin-top: 50px;">登录</el-button>
@@ -59,8 +59,8 @@
               <div style="font-size:12px;color:#B2B2B2;margin-top: -4px;
               margin-left: 85px;">
                 <span style="color:#108EE9;cursor:pointer" @click="register()">没有账号？去注册</span>
-                <span style="margin:0 4px;">|</span>
-                <span style="color:#999999;cursor:pointer" @click="rsetpassword">忘记密码？</span>
+                <!-- <span style="margin:0 4px;">|</span>
+                <span style="color:#999999;cursor:pointer" @click="rsetpassword">忘记密码？</span> -->
               </div>
               <el-form-item style="margin-bottom:8px;">
                 <el-button type="primary" key="xxcccc" class="login-content-button" @click="checklogin2" style="margin-top: 50px;">登录</el-button>

igirl-channel-web/app/front/vues/pages/login/login.js

@@ -95,6 +95,7 @@
           ],
         },
         reqUrl: "",
+        vCodeClick: false,
       }
     },
   mounted: function() {
@@ -163,6 +164,16 @@
       let obj = this.$root.copyParams({ mobile: this.form1.mobile }, "getVerifyCode", "/auth/accessAuth/springBoard");
       this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
         if (d.status == 0) {
+          let date = 60;
+          this.vCodeClick = true;
+          let timer = setInterval(() => {
+            $('#loginCode').text(date--);
+            if (date < 1) {
+              clearInterval(timer);
+              this.vCodeClick = false;
+              $('#loginCode').text('获取验证码');
+            }
+          }, 1000);
           console.log("返回信息", d);
         } else {
           console.log(d.msg);

igirl-channel-web/app/front/vues/pages/nowbuy/nowbuy.css

@@ -64,7 +64,7 @@
 .nowbuy-footer-warpper {
     height: 60px;
     padding-top: 10px;
-    background: #E6F0FF;
+    background: rgb(239, 240, 247);
     box-sizing: border-box;
     position: fixed;
     bottom: 0;
@@ -83,7 +83,7 @@
 }
 
 .nowbuy-footer>span {
-    color: #f54a07;
+    color: rgb(229, 7, 120);
 }
 
 .nowbuy-footer-img {
@@ -103,7 +103,8 @@
 .nowbuy-footer>div>button {
     margin-left: 30px;
     border-radius: 0;
-    color: aquamarine;
+    background: rgb(81, 210, 183) !important;
+    border: none;
     width: 120px;
     height: 40px;
 }
@@ -120,3 +121,8 @@
 .el-table tr {
     background: none;
 }
+
+.nowbuy-form .el-textarea__inner {
+    width: 996px;
+    min-height: 105px !important;
+}
\ No newline at end of file

igirl-channel-web/app/front/vues/pages/nowbuy/nowbuy.html

@@ -50,7 +50,8 @@
                         <el-input v-model="apply.email"></el-input>
                     </el-form-item>
                     <el-form-item label="备注：">
-                        <el-input type="textarea" v-model="apply.notes"></el-input>
+                        <el-input type="textarea" v-model="apply.notes">
+                        </el-input>
                     </el-form-item>
                 </el-form>
             </div>

igirl-channel-web/app/front/vues/pages/register/register.html

@@ -30,7 +30,7 @@
                 <el-input style="width:175px;" v-model="form1.code" placeholder="请输入验证码"><i slot="prefix"
                     class="el-input__icon el-icon-edit"></i></el-input>
                 <el-button id="loginCode" type="primary" plain style="width:135px;background: rgba(18,142,233,1);
-                color: rgba(255,255,255,1);" @click="obtaincode1">
+                color: rgba(255,255,255,1);" :disabled="vCodeClick" @click="obtaincode1">
                   获取验证码</el-button>
               </el-form-item>
               <div class="zhanghao">已有账号？

igirl-channel-web/app/front/vues/pages/register/register.js

@@ -100,6 +100,7 @@
             { min: 6, max: 18, message: '长度在 6 到 18 个字符', trigger: 'blur' }
           ],
         },
+        vCodeClick: false,
       }
     },
   mounted: function() {
@@ -161,9 +162,20 @@
       this.resetall();
     },
     obtaincode1(){
+
       let obj = this.$root.copyParams({ mobile: this.form1.mobile }, "getVerifyCode", "/auth/accessAuth/springBoard");
       this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
         if (d.status == 0) {
+          let date = 60;
+          this.vCodeClick = true;
+          let timer = setInterval(() => {
+            $('#loginCode').text(date--);
+            if (date < 1) {
+              clearInterval(timer);
+              this.vCodeClick = false;
+              $('#loginCode').text('获取验证码');
+            }
+          }, 1000);
           console.log("返回信息", d);
         } else {
           console.log(d.msg);

igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.css

@@ -235,7 +235,7 @@
     position: fixed;
     bottom: 0;
     left: 0;
-    padding-right: 159px;
+    padding-right: 10.9%;
 }
 
 .selftmregType {

igirl-channel-web/app/front/vues/pages/servicedetails/servicedetails.html

@@ -49,7 +49,7 @@
   <el-dialog title="提交需求" :visible.sync="dialogFormVisible" center width="600px">
     <el-form :model="form" ref="form" :rules="rules" style="margin-left:40px">
       <div style="color:#606266;font-size:14px;font-weight:400;line-height:12px;margin-bottom:30px;margin-left:12px">
-        服务需求：{{serviceName}}</div>
+        服务需求：{{serviceItem.itemName}}</div>
       <el-form-item label="您的名字：" prop="name">
         <el-input v-model="form.name" autocomplete="off" placeholder="请输入您的名字" style="width:360px"></el-input>
       </el-form-item>