123

08dfc077 · 刘泽奇 · de68e3de · 08dfc077 · 08dfc077 · 08dfc077
Commit 08dfc077 authored Dec 12, 2019 by 刘泽奇
6 changed files
--- a/igirl-channel-jdweb/app/front/entry/public/css/pagecom.css
+++ b/igirl-channel-jdweb/app/front/entry/public/css/pagecom.css
--- a/igirl-channel-jdweb/app/front/entry/public/js/index.js
+++ b/igirl-channel-jdweb/app/front/entry/public/js/index.js
@@ -183,7 +183,10 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
          if (find == -1) {
            this.selfFooterShow = true;
          } else {
+            $('.jdc-footer').hide();
            this.selfFooterShow = false;
+          console.log(find,'...........................',this.selfFooterShow)
          }
        } else {
          this.headerHidden = false;

--- a/igirl-channel-jdweb/app/front/vues/pages/selftmreg/index.css
+++ b/igirl-channel-jdweb/app/front/vues/pages/selftmreg/index.css
@@ -41,6 +41,8 @@
 #selftmreg .el-tag {
    margin: 5px 0px;
+    background:none;
+    border-radius:0;
 }
 #selftmreg .el-tree-node__content .el-tree-node__label {
@@ -223,16 +225,17 @@
 .tabButtomPrcie {
    width: 100%;
    height: 60px;
-    line-height: 53px;
+    line-height: 60px;
    font-size: 16px;
    color: #828282;
    text-align: right;
    box-sizing: border-box;
-    background: #F7F8FC;
+    background: #EFF0F7;
-    position: absolute;
+    z-index: 1001;
+    position: fixed;
    bottom: 0;
    left: 0;
-    padding-right: 20px;
+    padding-right: 159px;
 }
 .selftmregType {
@@ -640,10 +643,15 @@
    border: 0px solid #0989C5;
    color: #fff;
    border-radius: 0;
+    padding:8px 20px;
+    width:170px;
 }
 .step2-footer>button:nth-child(1) {
    transform: translateX(-10px);
+    background: #fff;
+    color: #51d2b7;
+    border: 1px solid;
 }
 .step3-indent .el-textarea__inner {
@@ -719,4 +727,8 @@
 .fade-leave-active below version 2.1.8 */
    {
    opacity: 0;
+}
+.selftmreg .el-dialog__wrapper .el-dialog__header {
+    text-align:center;
 }
\ No newline at end of file
--- a/igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.html
+++ b/igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.html
@@ -7,7 +7,7 @@
    </el-breadcrumb>
  </div>
  <div style="background-color:white;width:1200px;margin:0 auto;padding-bottom: 90px; ">
-    <div style="text-align:left;border:1px solid rgba(220,223,230,1);position: relative;padding-bottom: 50px;">
+    <div style="text-align:left;border:1px solid rgba(220,223,230,1);position: relative;">
      <div class="selftmreg_main">
        <!-- <el-alert
            title="商标注册申请递交后，在审查阶段存在被商标审查机构驳回的可能，且驳回后不予退费，请知悉。"
@@ -236,7 +236,7 @@
                style="color:#E50778;font-style: normal;">￥{{form.totalPublicExpense}}</i></span> -->
            <span style="margin-right:30px;text-align: center;color: #03004C;">应付总额：<i
                style="color:#E50778;font-style: normal;font-size: 24px;">￥{{totalPrices?totalPrices:0}}</i></span>
-            <el-button type="primary" style=" background: rgb(81, 210, 183);border-radius:0;color:#fff;border:0;"
+            <el-button  type="primary" style="padding:8px 20px;width:150px; background: rgb(81, 210, 183);width: 170px;border-radius:0;color:#fff;border:0;"
              @click="submitForm(\'form\')">下一步</el-button>
          </div>
        </div>
@@ -352,7 +352,7 @@
            <div style="clear:both;"></div>
            <el-form-item label-width="140px" label="邮政编码" style="width:493px;float:left;padding-right:50px;"
              prop="zipCode">
-              <el-input placeHolder="请输入邮政编码" v-model="apply.zipCode"></el-input>
+              <el-input @input="maxZipCode" placeHolder="请输入邮政编码" v-model="apply.zipCode"></el-input>
            </el-form-item>
            <div style="clear:both;"></div>
@@ -369,7 +369,7 @@
            <div style="clear:both;"></div>
            <el-form-item label-width="140px" label="联系电话" style="width:493px;float:left;padding-right:50px;"
              prop="mobile">
-              <el-input v-model="apply.mobile" placeHolder="请填写11位手机号码"></el-input>
+              <el-input v-model="apply.mobile" @input="maxPhoneNumber" placeHolder="请填写11位手机号码"></el-input>
            </el-form-item>
            <div style="clear:both;"></div>
            <el-form-item label-width="140px" label="电子邮箱" style="width:493px;float:left;padding-right:50px;"
@@ -525,11 +525,26 @@
          </div>
        </div>
-        <div style="text-align:center;padding-bottom:50px;" class="step2-footer">
-          <el-button @click="tobefore">上一步</el-button>
-          <el-button style="" type="primary" @click="submitForm(\'apply\')">
+        <div class="tabButtomPrcie">
-            下一步</el-button>
+          <!-- <span style="margin-right:30px;text-align: center;color: #03004C;">官费总额：<i
-        </div>
+              style="color:#E50778;font-style: normal;">￥{{form.totalPublicExpense}}</i></span> -->
+              <el-button style="padding: 8px 20px;
+              width: 170px;
+              background: none;
+              border-radius: 0px;
+              color: rgb(81, 210, 183);
+              border: 1px solid" @click="tobefore">上一步</el-button>
+              <el-button style="padding: 8px 20px;
+              width: 170px;
+              background: rgb(81, 210, 183);
+              border-radius: 0px;
+              color: rgb(255, 255, 255);
+              border: 0px" type="primary" @click="submitForm(\'apply\')">
+                下一步</el-button>
+        </div>        
      </el-form>
      <!-- page3 -->
      <el-form v-show="step==3" ref="form" :rules="rules" :model="form" class="demo-ruleForm" label-width="120px">
@@ -794,9 +809,9 @@
      {{item.code}}类{{item.name}}，商品/服务项目<span
        style="color:red;">不足10项</span>，已选{{item.checked}}项，还可选{{10-item.checked}}个小项</span>
    </div>
-    <span slot="footer" class="dialog-footer">
+    <span slot="footer" class="dialog-footer" style="text-align:center;">
-      <el-button style="background:#66b1ff;border-color: #66b1ff;color: #FFF;" @click="closeConfrim()">修 改</el-button>
+      <el-button style="background:#51d2b7;border-color: #66b1ff;color: #FFF;border-radius:0;width:170px;padding:8px 20px;" @click="closeConfrim()">修 改</el-button>
-      <el-button style="background:#fff;border-color: #DCDFE6;color: #606266;" type="primary"
+      <el-button style="background:#fff;border-color: #DCDFE6;color: #606266;border-radius:0;width:170px;padding:8px 20px;" type="primary"
        @click="submitForm(\'form\',true)">确 定</el-button>
    </span>
  </el-dialog>

--- a/igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.js
+++ b/igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.js
@@ -238,7 +238,7 @@
        d: {},
        action: "",
        invoiceTaxRate: 10,
-        step: "1",
+        step: "2",
        isRead: false,
        steps: [
          { title: "填写基本信息" },
@@ -316,15 +316,15 @@
        orderSubInfo: null,
        totalPrices: null,
        dataList: [],
-        options: []
+        options: [],
      }
    },
-  computed: Vuex.mapState({
+  computed:{
-    count: state => state.count,
-    headStyle: function () {
+  },
-      return { "background-color": "white" };
-    }
-  }),
    created: function() {
      var that = this;
      var itemCode = this.$router.history.current.query.itemCode || 'zzsbzc';
@@ -452,7 +452,17 @@
    */
  },
  methods: {
+    maxZipCode(){
+      if(this.apply.zipCode.length>6){
+        console.log(this.apply.zipCode);
+        this.apply.zipCode = this.apply.zipCode.substring(0,5);
+      }
+    },
+    maxPhoneNumber(){
+      if(this.apply.mobile.length>11){
+        this.apply.mobile = this.apply.mobile.substring(0,10);
+      }
+    },
    getItemCode(){
      var obj = this.$root.copyParams({ channelUserId: "", itemCode: "sbfu" }, "getProductListByTypeOneCode", "/action/tmOrder/springBoard");
      this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
@@ -473,7 +483,7 @@
      } else if (i == parseInt(this.step)) {
        return 'color: #FFFFFF;'
      } else if (i > parseInt(this.step)) {
-        return 'color: #FFFFFF;'
+        return 'color: #BBB;'
      }
    },
    pointsRuleBackColor(i) {
@@ -482,7 +492,7 @@
      } else if (i == parseInt(this.step)) {
        return 'background: #51d2b7;z-index: ' + Math.abs(i - 5)
      } else if (i > parseInt(this.step)) {
-        return 'background: #eee;z-index: ' + Math.abs(i - 5)
+        return 'background:#EFF0F7;z-index: ' + Math.abs(i - 5)
      }
    },
    toViewImg(src) {
@@ -1194,10 +1204,6 @@
    },
    submitForm(formName, agree) {
-      console.log(document.documentElement.scrollTop, "llllllllllllllllllllll");
-      /*
-      */
      var that = this;
      if (this.nclOne.length > 0) {

--- a/igirl-channel-jdweb/package-lock.json
+++ b/igirl-channel-jdweb/package-lock.json
@@ -1726,6 +1726,11 @@
      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz",
      "integrity": "sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ=="
    },
+    "date-format": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/date-format/-/date-format-3.0.0.tgz",
+      "integrity": "sha512-eyTcpKOcamdhWJXj56DpQMo1ylSQpcGtGKXcU0Tb97+K56/CF5amAqqqNj0+KvA0iw2ynxtHWFsPDSClCxe48w=="
+    },
    "dateformat": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
@@ -3328,6 +3333,11 @@
      "integrity": "sha1-Tnmumy6zi/hrO7Vr8+ClaqX8q9c=",
      "dev": true
    },
+    "flatted": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
+      "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg=="
+    },
    "follow-redirects": {
      "version": "1.9.0",
      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.9.0.tgz",
@@ -6082,6 +6092,33 @@
        "chalk": "^1.0.0"
      }
    },
+    "log4js": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.1.0.tgz",
+      "integrity": "sha512-fSCHMYsMJbHwfNTuMlopVVcfkKwIRLh5mpNZGB2oBbnSmr3yUTo4tL4xGBA0/q29xowlu96eTXGghJFNhPXMnA==",
+      "requires": {
+        "date-format": "^3.0.0",
+        "debug": "^4.1.1",
+        "flatted": "^2.0.1",
+        "rfdc": "^1.1.4",
+        "streamroller": "^2.2.3"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        }
+      }
+    },
    "logalot": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/logalot/-/logalot-2.1.0.tgz",
@@ -7975,6 +8012,11 @@
      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
      "dev": true
    },
+    "rfdc": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz",
+      "integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug=="
+    },
    "rimraf": {
      "version": "2.6.2",
      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
@@ -8942,6 +8984,51 @@
      "resolved": "https://registry.npmjs.org/stream-wormhole/-/stream-wormhole-1.1.0.tgz",
      "integrity": "sha512-gHFfL3px0Kctd6Po0M8TzEvt3De/xu6cnRrjlfYNhwbhLPLwigI2t1nc6jrzNuaYg5C4YF78PPFuQPzRiqn9ew=="
    },
+    "streamroller": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-2.2.3.tgz",
+      "integrity": "sha512-AegmvQsscTRhHVO46PhCDerjIpxi7E+d2GxgUDu+nzw/HuLnUdxHWr6WQ+mVn/4iJgMKKFFdiUwFcFRDvcjCtw==",
+      "requires": {
+        "date-format": "^2.1.0",
+        "debug": "^4.1.1",
+        "fs-extra": "^8.1.0"
+      },
+      "dependencies": {
+        "date-format": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz",
+          "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA=="
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "fs-extra": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+          "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+          "requires": {
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "graceful-fs": {
+          "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
+          "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        }
+      }
+    },
    "streamsearch": {
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz",