Merge branch 'channel-access' of gitlab.gongsibao.com:jiangyong/zhichan into channel-access

7d5eacf0 · 任建 · f355d52d · 0898a82a · 7d5eacf0 · 7d5eacf0
Commit 7d5eacf0 authored Jan 13, 2020 by 任建
4 changed files
--- a/channel-access/src/views/pages/selftmreg/ApplicationInfo.vue
+++ b/channel-access/src/views/pages/selftmreg/ApplicationInfo.vue
@@ -18,17 +18,13 @@
        label-position="left"
      >
        <el-form-item label="申请人类型：" prop="resource">
-          <el-radio-group
+          <el-radio-group v-model="aruleForm.resource">
-            v-model="aruleForm.resource"
-            @change="handleUsersChooseClick"
-          >
            <el-radio :label="1" border>企业</el-radio>
            <el-radio :label="2" border>个体户</el-radio>
          </el-radio-group>
        </el-form-item>
        <div v-if="aruleForm.resource == 1">
          <el-form-item label="公司名称：" prop="name">
-            <!-- @blur.native="handleInputCompanyNameBlur" -->
            <el-autocomplete
              v-model="aruleForm.name"
              :fetch-suggestions="querySearchAsync"
@@ -40,7 +36,6 @@
            ></el-autocomplete>
          </el-form-item>
          <el-form-item label="统一社会信用代码：" prop="xinyongma">
-            <!--  @blur="handleInputCreditCodeBlur" -->
            <el-input
              v-model="aruleForm.xinyongma"
              placeholder="请输入统一社会信用代码"
@@ -55,7 +50,6 @@
            </el-popover>
          </el-form-item>
          <el-form-item label="执照详细地址：" prop="address">
-            <!--   @blur="handleInputLicenseAddressBlur" -->
            <el-input
              v-model="aruleForm.address"
              placeholder="请输入执照详细地址"
@@ -66,7 +60,6 @@
              v-model="aruleForm.postal"
              placeholder="请输入邮政编码"
              :maxlength="6"
-              @blur="handleInputPostalCodeBlur"
            ></el-input>
          </el-form-item>
        </div>
@@ -75,7 +68,6 @@
            <el-input
              v-model="aruleForm.uname"
              placeholder="请输入您的姓名"
-              @blur="handleInputUserNameBlur"
            ></el-input>
          </el-form-item>
          <el-form-item label="身份证号：" prop="uid">
@@ -83,21 +75,18 @@
              v-model="aruleForm.uid"
              placeholder="请输入您的身份证号"
              :maxlength="18"
-              @blur="handleInputIdCardBlur"
            ></el-input>
          </el-form-item>
          <el-form-item label="身份证住址：" prop="uaddress">
            <el-input
              v-model="aruleForm.uaddress"
              placeholder="请输入身份证住址"
-              @blur="handleInputIdAddressBlur"
            ></el-input>
          </el-form-item>
          <el-form-item label="统一社会信用代码：" prop="xinyongma">
            <el-input
              v-model="aruleForm.xinyongma"
              placeholder="请输入统一社会信用代码"
-              @blur="handleInputUCreditCodeBlur"
            ></el-input>
            <el-popover
              placement="right-end"
@@ -113,7 +102,6 @@
              v-model="aruleForm.postal"
              placeholder="请输入邮政编码"
              :maxlength="6"
-              @blur="handleInputUPostalCodeBlur"
            ></el-input>
          </el-form-item>
        </div>
@@ -138,21 +126,18 @@
          <el-input
            v-model="ruleForm.contanct"
            placeholder="请输入联系人"
-            @blur="handleInputCustomerBlur"
          ></el-input>
        </el-form-item>
        <el-form-item label="联系电话：" prop="phone">
          <el-input
            v-model="ruleForm.phone"
            placeholder="请输入联系电话"
-            @blur="handleInputTelnumBlur"
          ></el-input>
        </el-form-item>
        <el-form-item label="电子邮箱：" prop="email">
          <el-input
            v-model="ruleForm.email"
            placeholder="请输入电子邮箱"
-            @blur="handleInputEmailBlur"
          ></el-input>
        </el-form-item>
        <el-form-item label="座机：">
@@ -375,100 +360,40 @@ export default {
    },
    addMessage() {
      console.log(this.ruleForm);
-    },
-    //申请人类型 参数传递
-    handleUsersChooseClick() {
-      this.$bus.emit("on-userschoose-click", this.aruleForm.resource);
-    },
-    // 企业申请人 参数传递
-    handleInputCompanyNameBlur() {
-      this.$bus.emit("on-input-companyname-blur", this.aruleForm.name);
-    },
-    handleInputCreditCodeBlur() {
-      this.$bus.emit("on-input-creditcode-blur", this.aruleForm.xinyongma);
-    },
-    handleInputLicenseAddressBlur() {
-      this.$bus.emit("on-input-licenseaddress-blur", this.aruleForm.address);
-    },
-    handleInputPostalCodeBlur() {
-      this.$bus.emit("on-input-postalcode-blur", this.aruleForm.postal);
-    },
-    // 个体户申请人 参数传递
-    handleInputUserNameBlur() {
-      this.$bus.emit("on-input-username-blur", this.aruleForm.uname);
-    },
-    handleInputIdCardBlur() {
-      this.$bus.emit("on-input-idcard-blur", this.aruleForm.uid);
-    },
-    handleInputIdAddressBlur() {
-      this.$bus.emit("on-input-idaddress-blur", this.aruleForm.uaddress);
-    },
-    handleInputUCreditCodeBlur() {
-      this.$bus.emit("on-input-ucreditcode-blur", this.aruleForm.xinyongma);
-    },
-    handleInputUPostalCodeBlur() {
-      this.$bus.emit("on-input-upostalcode-blur", this.aruleForm.postal);
-    },
-    // 客户联系人 参数传递
-    handleInputCustomerBlur() {
-      this.$bus.emit("on-input-customer-blur", this.ruleForm.contanct);
-    },
-    // 联系电话 参数传递
-    handleInputTelnumBlur() {
-      this.$bus.emit("on-input-telnum-blur", this.ruleForm.phone);
-    },
-    // 电子邮箱 参数传递
-    handleInputEmailBlur() {
-      this.$bus.emit("on-input-email-blur", this.ruleForm.email);
    }
  },
  updated() {
    this.$nextTick(() => {
-      //
+      // 申请人类别
      this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype = this.aruleForm.resource;
-      console.log(
+      // 企业
-        this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype
+      //  公司名称
-      );
      this.$parent.$parent.confirmStepsParams.stepTwoNineParams.companyName = this.aruleForm.name;
-      console.log(
+      //  统一社会信用代码
-        this.$parent.$parent.confirmStepsParams.stepTwoNineParams.companyName
-      );
      this.$parent.$parent.confirmStepsParams.stepTwoNineParams.creditCode = this.aruleForm.xinyongma;
-      console.log(
+      //  执照详细地址
-        this.$parent.$parent.confirmStepsParams.stepTwoNineParams.creditCode
-      );
      this.$parent.$parent.confirmStepsParams.stepTwoNineParams.licenseAddress = this.aruleForm.address;
-      console.log(
+      //  邮政编码
-        this.$parent.$parent.confirmStepsParams.stepTwoNineParams.licenseAddress
-      );
      this.$parent.$parent.confirmStepsParams.stepTwoNineParams.postalCode = this.aruleForm.postal;
-      console.log(
+      // 个体户
-        this.$parent.$parent.confirmStepsParams.stepTwoNineParams.postalCode
+      // 姓名
-      );
      this.$parent.$parent.confirmStepsParams.stepTwoNineParams.username = this.aruleForm.uname;
-      console.log(
+      // 身份证号
-        this.$parent.$parent.confirmStepsParams.stepTwoNineParams.username
-      );
      this.$parent.$parent.confirmStepsParams.stepTwoNineParams.idCard = this.aruleForm.uid;
-      console.log(
+      // 身份证住址
-        this.$parent.$parent.confirmStepsParams.stepTwoNineParams.idCard
-      );
      this.$parent.$parent.confirmStepsParams.stepTwoNineParams.idAddress = this.aruleForm.uaddress;
-      console.log(
+      // 统一社会信用代码
-        this.$parent.$parent.confirmStepsParams.stepTwoNineParams.idAddress
+      this.$parent.$parent.confirmStepsParams.stepTwoNineParams.ucreditCode = this.aruleForm.xinyongma;
-      );
+      // 邮政编码
-      //    this.$parent.$parent.confirmStepsParams.stepTwoNineParams.ucreditCode = this.aruleForm.xinyongma;
+      this.$parent.$parent.confirmStepsParams.stepTwoNineParams.upostalCode = this.aruleForm.postal;
-      // console.log(
-      //   this.$parent.$parent.confirmStepsParams.stepTwoNineParams.ucreditCode
+      // 联系人
-      // );
+      // 客户联系人
-      //   this.$parent.$parent.confirmStepsParams.stepTwoNineParams.upostalCode = this.aruleForm.postal;
+      this.$parent.$parent.confirmStepsParams.stepTwoNineParams.customer = this.ruleForm.contanct;
-      // console.log(
+      // 联系电话
-      //   this.$parent.$parent.confirmStepsParams.stepTwoNineParams.upostalCode
+      this.$parent.$parent.confirmStepsParams.stepTwoNineParams.telNum = this.ruleForm.phone;
-      // );
+      // 电子邮箱
+      this.$parent.$parent.confirmStepsParams.stepTwoNineParams.email = this.ruleForm.email;
    });
  }
 };

--- a/channel-access/src/views/pages/selftmreg/ConfirmOrder.vue
+++ b/channel-access/src/views/pages/selftmreg/ConfirmOrder.vue
 <!-- 第三步：确认订单 -->
 <template>
  <div class="confirm">
    <div class="info-title">
      <i class="selftmreg_shuxian"></i>
      <h4>
        商标信息
-        <span class="edit">
+        <span class="edit" @click="goStepOne">
          <i class="el-icon-edit"></i>
          <b>编辑</b>
        </span>
@@ -15,24 +14,52 @@
    <div class="brand-info">
      <p>
        <strong>商标类型：</strong>
-        <span>{{ msgFromParent.steponeChoose.type }}</span>
+        <span>{{
+          this.$parent.$parent.confirmStepsParams.stepOneThreeParams.type == 1
+            ? "文字"
+            : this.$parent.$parent.confirmStepsParams.stepOneThreeParams.type ==
+              2
+            ? "图形"
+            : "文字及图形"
+        }}</span>
      </p>
-      <p v-if="msgFromParent.steponeChoose.type !== 2">
+      <p
+        v-if="
+          this.$parent.$parent.confirmStepsParams.stepOneThreeParams.type !== 2
+        "
+      >
        <strong>商标名称：</strong>
-        <span>{{ msgFromParent.steponeChoose.tname }}</span>
+        <span>{{
+          this.$parent.$parent.confirmStepsParams.stepOneThreeParams.tname
+        }}</span>
      </p>
      <p>
        <strong>商标图样：</strong>
-        <img :src="brandIcon" alt />
+        <img
+          :src="
+            this.$parent.$parent.confirmStepsParams.stepOneThreeParams.type ==
+              1 &&
+            this.$parent.$parent.confirmStepsParams.stepOneThreeParams
+              .brandauto == true
+              ? brandIconAuto
+              : brandIconManual
+          "
+          alt
+        />
      </p>
      <p>
        <strong>商标类别：</strong>
        <span class="detail-type">
-          <i>15 类 乐器</i>
+          <i>{{
+            this.$parent.$parent.confirmStepsParams.stepOneThreeParams.bigKind
+          }}</i>
          <br />
-          <b v-for="item in checkedKinds" :key="item.fullname">{{
+          <b
-            item.fullname
+            v-for="item in this.$parent.$parent.confirmStepsParams
-          }}</b>
+              .stepOneThreeParams.smallKinds"
+            :key="item.fullname"
+            >{{ item.fullname }}</b
+          >
        </span>
      </p>
    </div>
@@ -41,7 +68,7 @@
      <i class="selftmreg_shuxian"></i>
      <h4>
        申请人及联系人信息
-        <span class="edit" @click="goSteptwo">
+        <span class="edit" @click="goStepTwo">
          <i class="el-icon-edit"></i>
          <b>编辑</b>
        </span>
@@ -51,58 +78,126 @@
      <ul>
        <li>
          <strong>申请人类型：</strong>
-          <span>{{ msgFromParent.steptwoApplication.atype }}</span>
+          <span>{{
+            this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype == 1
+              ? "企业"
+              : "个体户"
+          }}</span>
        </li>
-        <li v-if="msgFromParent.steptwoApplication.atype == 1">
+        <li
+          v-if="
+            this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype == 1
+          "
+        >
          <strong>公司名称：</strong>
-          <span>{{ msgFromParent.steptwoApplication.companyName }}</span>
+          <span>{{
+            this.$parent.$parent.confirmStepsParams.stepTwoNineParams
+              .companyName
+          }}</span>
        </li>
-        <li v-if="msgFromParent.steptwoApplication.atype == 1">
+        <li
+          v-if="
+            this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype == 1
+          "
+        >
          <strong>邮政编码：</strong>
-          <span>{{ msgFromParent.steptwoApplication.postalCode }}</span>
+          <span>{{
+            this.$parent.$parent.confirmStepsParams.stepTwoNineParams.postalCode
+          }}</span>
        </li>
-        <li v-if="msgFromParent.steptwoApplication.atype == 1">
+        <li
+          v-if="
+            this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype == 1
+          "
+        >
          <strong>公司地址：</strong>
-          <span>{{ msgFromParent.steptwoApplication.licenseAddress }}</span>
+          <span>{{
+            this.$parent.$parent.confirmStepsParams.stepTwoNineParams
+              .licenseAddress
+          }}</span>
        </li>
-        <li v-if="msgFromParent.steptwoApplication.atype == 2">
+        <li
+          v-if="
+            this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype == 2
+          "
+        >
          <strong>申请人姓名：</strong>
-          <span>{{ msgFromParent.steptwoApplication.username }}</span>
+          <span>{{
+            this.$parent.$parent.confirmStepsParams.stepTwoNineParams.username
+          }}</span>
        </li>
-        <li v-if="msgFromParent.steptwoApplication.atype == 2">
+        <li
+          v-if="
+            this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype == 2
+          "
+        >
          <strong>邮政编码：</strong>
-          <span>{{ msgFromParent.steptwoApplication.upostalCode }}</span>
+          <span>{{
+            this.$parent.$parent.confirmStepsParams.stepTwoNineParams
+              .upostalCode
+          }}</span>
        </li>
-        <li v-if="msgFromParent.steptwoApplication.atype == 2">
+        <li
+          v-if="
+            this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype == 2
+          "
+        >
          <strong>申请人地址：</strong>
-          <span>{{ msgFromParent.steptwoApplication.idAddress }}</span>
+          <span>{{
+            this.$parent.$parent.confirmStepsParams.stepTwoNineParams.idAddress
+          }}</span>
        </li>
        <li>
          <strong>联系人：</strong>
-          <span>{{ msgFromParent.steptwoContact.customer }}</span>
+          <span>{{
+            this.$parent.$parent.confirmStepsParams.stepTwoNineParams.customer
+          }}</span>
        </li>
        <li>
          <strong>联系电话：</strong>
-          <span>{{ msgFromParent.steptwoContact.telNum }}</span>
+          <span>{{
+            this.$parent.$parent.confirmStepsParams.stepTwoNineParams.telNum
+          }}</span>
        </li>
        <li>
          <strong>电子邮箱：</strong>
-          <span>{{ msgFromParent.steptwoContact.email }}</span>
+          <span>{{
+            this.$parent.$parent.confirmStepsParams.stepTwoNineParams.email
+          }}</span>
        </li>
-        <li v-if="msgFromParent.steptwoApplication.atype == 1">
+        <li
+          v-if="
+            this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype == 1
+          "
+        >
          <strong>信用编码：</strong>
-          <span>{{ msgFromParent.steptwoApplication.creditCode }}</span>
+          <span>{{
+            this.$parent.$parent.confirmStepsParams.stepTwoNineParams.creditCode
+          }}</span>
        </li>
-        <li v-if="msgFromParent.steptwoApplication.atype == 2">
+        <li
+          v-if="
+            this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype == 2
+          "
+        >
          <strong>信用编码：</strong>
-          <span>{{ msgFromParent.steptwoApplication.ucreditCode }}</span>
+          <span>{{
+            this.$parent.$parent.confirmStepsParams.stepTwoNineParams
+              .ucreditCode
+          }}</span>
        </li>
-        <li v-if="msgFromParent.steptwoApplication.atype == 2">
+        <li
+          v-if="
+            this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype == 2
+          "
+        >
          <strong>身份证号：</strong>
-          <span>{{ msgFromParent.steptwoApplication.idCard }}</span>
+          <span>{{
+            this.$parent.$parent.confirmStepsParams.stepTwoNineParams.idCard
+          }}</span>
        </li>
      </ul>
    </div>
@@ -131,29 +226,34 @@ export default {
      // 选中的商标种类
      checkedKinds: [],
      // 商标展示
-      brandIcon: "",
-      brandIcon1: "",
+      brandIconManual: "",
-      brandIcon2: ""
+      brandIconAuto: ""
    };
  },
  methods: {
-    // click未生效
+    // 编辑 商标信息
-    goSteptwo() {
+    goStepOne() {
+      console.log(111);
+      // 去第一步骤的页面
+      this.$emit("getIndex", 0);
+    },
+    // 编辑 申请人及联系人信息
+    goStepTwo() {
      console.log(222);
      // 去第二步骤的页面
+      this.$emit("getIndex", 1);
    }
  },
  created() {
    let checkedKinds = JSON.parse(localStorage.getItem("classDataList"));
    this.checkedKinds = checkedKinds;
-    let brandIcon1 = localStorage.getItem("manualImgToConfirm");
+    let brandIconManual = localStorage.getItem("manualImgToConfirm");
-    this.brandIcon1 = brandIcon1;
+    this.brandIconManual = brandIconManual;
-    let brandIcon2 = localStorage.getItem("autoImgToConfirm");
+    let brandIconAuto = localStorage.getItem("autoImgToConfirm");
-    this.brandIcon2 = brandIcon2;
+    this.brandIconAuto = brandIconAuto;
-    this.brandIcon = this.brandIcon1;
-    console.log(this.brandIcon);
  }
 };
 </script>

--- a/channel-access/src/views/pages/selftmreg/ModifyTrademark.vue
+++ b/channel-access/src/views/pages/selftmreg/ModifyTrademark.vue
@@ -14,10 +14,7 @@
            label-position="left"
          >
            <el-form-item label="商标类型：" prop="resource">
-              <el-radio-group
+              <el-radio-group v-model="ruleForm.resource">
-                v-model="ruleForm.resource"
-                @change="handleRadiosChooseClick"
-              >
                <el-radio :label="1">文字</el-radio>
                <el-radio :label="2">图形</el-radio>
                <el-radio :label="3">文字及图形</el-radio>
@@ -34,7 +31,6 @@
              <el-input
                v-model="ruleForm.name"
                placeholder="请输入商标名称"
-                @blur="handleInputBrandnameBlur"
              ></el-input>
            </el-form-item>
            <el-form-item
@@ -229,13 +225,6 @@
        </div>
      </div>
    </div>
-    <!-- 底部按钮的重写 -->
-    <!-- <div
-      style="float:left;display:inline-flex; z-index:100000000;position:absolute;left:0;right:0;height:30px;width:90000px;background:red;"
-    >
-      hello
-    </div> -->
  </div>
 </template>
@@ -368,10 +357,10 @@ export default {
      this.loading = true;
      this.imgUrl = msg;
      uploadStandardTm(this.imgUrl).then(res => {
-        // 手动上传图片的保存
+        // 手动上传图片的 保存在 localStorage里面
        this.manualImgToConfirm = res.data.url;
        localStorage.setItem("manualImgToConfirm", this.manualImgToConfirm);
-        // console.log(this.manualImgToConfirm);
        this.loading = false;
        if (res.status == 0) {
          this.$message({
@@ -409,16 +398,19 @@ export default {
          this.loading = false;
          if (res.status == 0) {
            this.imgUrl = res.data.url;
+            // 自动生成的图片 保存在 localStorage里面
-            // 自动生成的图片
            this.autoImgToConfirm = res.data.url;
            localStorage.setItem("autoImgToConfirm", this.autoImgToConfirm);
-            // console.log(this.autoImgToConfirm);
          }
        });
      }
+      // 传递参数，改变点击状态为true
+      this.$bus.emit("on-click-brandauto", true);
+    },
+    manualupload() {
+      // 传递参数，改变点击状态为true
+      this.$bus.emit("on-click-brandmanual", true);
    },
-    manualupload() {},
    // 分类信息选择
    // 清除选中的标签
@@ -454,19 +446,6 @@ export default {
        });
    },
-    // 类型选择 参数传递
-    handleRadiosChooseClick() {
-      // this.$parent.$parent.confirmStepsParams.stepOneThreeParams.type = this.ruleForm.resource;
-      // console.log(
-      //   this.$parent.$parent.confirmStepsParams.stepOneThreeParams.type
-      // );
-      // this.$bus.emit("on-radioschoose-click", this.ruleForm.resource);
-    },
-    // 输入名字 参数传递
-    handleInputBrandnameBlur() {
-      this.$bus.emit("on-input-brandname-blur", this.ruleForm.name);
-    },
    // 树形结构的处理节点是否被选中
    handleCheckChange(data, checked, indeterminate) {
      // 检测第三级节点是否被选中(一级节点两位code，二级节点四位code,三级节点6位或是0位code)
@@ -547,7 +526,7 @@ export default {
          let index = this.ncldata.findIndex((item, index) => {
            return item.code == node.data.code;
          });
-          console.log(index);
+          // console.log(index);
          this.ncldata[index].children = res.data.rows;
          setTimeout(() => {
            var data;
@@ -641,24 +620,18 @@ export default {
  },
  updated() {
    this.$nextTick(() => {
+      // 商标类型
      this.$parent.$parent.confirmStepsParams.stepOneThreeParams.type = this.ruleForm.resource;
-      console.log(
+      //  商标名称
-        this.$parent.$parent.confirmStepsParams.stepOneThreeParams.type
-      );
      this.$parent.$parent.confirmStepsParams.stepOneThreeParams.tname = this.ruleForm.name;
-      console.log(
+      // 如果已经选择了某一类，第xx类 xxx 已经渲染出来
-        this.$parent.$parent.confirmStepsParams.stepOneThreeParams.tname
-      );
      if (this.$refs.bigKind) {
        this.$parent.$parent.confirmStepsParams.stepOneThreeParams.bigKind = this.$refs.bigKind.innerHTML;
-        console.log(
-          this.$parent.$parent.confirmStepsParams.stepOneThreeParams.bigKind
-        );
        this.$parent.$parent.confirmStepsParams.stepOneThreeParams.smallKinds = this.classDataList;
-        console.log(
-          this.$parent.$parent.confirmStepsParams.stepOneThreeParams.smallKinds
-        );
      }
+      // 手动上传按钮的改变
+      // this.manualupload();
    });
  }
 };

--- a/channel-access/src/views/pages/selftmreg/Selftmreg.vue
+++ b/channel-access/src/views/pages/selftmreg/Selftmreg.vue