123

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

@@ -11,7 +11,7 @@
 		<div class="jdindentdetail-nav">
 		<div class="jdindentdetail-nav">
 			<span>当前位置：</span>
 			<span>当前位置：</span>
 			<el-breadcrumb separator-class="el-icon-arrow-right">
 			<el-breadcrumb separator-class="el-icon-arrow-right">
-				<el-breadcrumb-item :to="{ path: \'/1688/jdindentlist?deliveryOrderNo=\' + deliveryOrderNo }">交付中心
+				<el-breadcrumb-item :to="{ path: \'/1688/jdindentlist?channelUserId=\' + channelUserId }">交付中心
 				</el-breadcrumb-item>
 				</el-breadcrumb-item>
 				<el-breadcrumb-item>订单详情</el-breadcrumb-item>
 				<el-breadcrumb-item>订单详情</el-breadcrumb-item>
 			</el-breadcrumb>
 			</el-breadcrumb>
@@ -55,9 +55,9 @@
 					<p>商标图样</p>
 					<p>商标图样</p>
 				</div>
 				</div>
 				<div>
 				<div>
-					<p>商标名称：<span>{{deliveryInfo.tmName}}</span></p>
-					<p>商标类型：<span>{{deliveryInfo.tmFormType}}</span></p>
-					<p>商标说明：<span>{{deliveryInfo.notes}}</span></p>
+					<p>商标名称：<span>{{deliveryInfo.tmName?deliveryInfo.tmName:\"-\"}}</span></p>
+					<p>商标类型：<span>{{deliveryInfo.tmFormType?deliveryInfo.tmFormType:\"-\"}}</span></p>
+					<p>商标说明：<span>{{deliveryInfo.notes?deliveryInfo.notes:\"-\"}}</span></p>
 				</div>
 				</div>
 
 
 			</div>
 			</div>
@@ -134,10 +134,10 @@
 						@click="showDialog(4)"><i class="el-icon-edit"></i> 修改</span>
 						@click="showDialog(4)"><i class="el-icon-edit"></i> 修改</span>
 				</div>
 				</div>
 				<ul>
 				<ul>
-					<li><span>公司名称：</span><span>{{applyInfo.name}}</span></li>
-					<li><span>统一社会信用代码：</span><span>{{applyInfo.code}}</span></li>
-					<li><span>公司地址：</span><span>{{applyInfo.applyAddr}}</span></li>
-					<li><span>邮编地址：</span><span>{{applyInfo.zipCode}}</span></li>
+					<li><span>公司名称：</span><span>{{applyInfo.name?applyInfo.name:\"-\"}}</span></li>
+					<li><span>统一社会信用代码：</span><span>{{applyInfo.code?applyInfo.code:\'-\'}}</span></li>
+					<li><span>公司地址：</span><span>{{applyInfo.applyAddr?applyInfo.applyAddr:\"-\"}}</span></li>
+					<li><span>邮编地址：</span><span>{{applyInfo.zipCode?applyInfo.zipCode:\'-\'}}</span></li>
 				</ul>
 				</ul>
 			</div>
 			</div>
 			<div class="jdindentdetail-main-infohr"></div>
 			<div class="jdindentdetail-main-infohr"></div>
@@ -146,10 +146,10 @@
 					订单联系人 <span v-if="itemName" @click="showDialog(5)"><i class="el-icon-edit"></i> 修改</span>
 					订单联系人 <span v-if="itemName" @click="showDialog(5)"><i class="el-icon-edit"></i> 修改</span>
 				</div>
 				</div>
 				<ul>
 				<ul>
-					<li><span>联系人：</span><span>{{applyInfo.contacts}}</span></li>
-					<li><span>手机号码：</span><span>{{applyInfo.mobile}}</span></li>
-					<li><span>电子邮箱：</span><span>{{applyInfo.email}}</span></li>
-					<li><span>座机号码：</span><span>{{applyInfo.zipCode}}</span></li>
+					<li><span>联系人：</span><span>{{applyInfo.contacts?applyInfo.contacts:\'-\'}}</span></li>
+					<li><span>手机号码：</span><span>{{applyInfo.mobile?applyInfo.mobile:\'-\'}}</span></li>
+					<li><span>电子邮箱：</span><span>{{applyInfo.email?applyInfo.email:\'-\'}}</span></li>
+					<li><span>座机号码：</span><span>{{applyInfo.zipCode?applyInfo.zipCode:\'-\'}}</span></li>
 				</ul>
 				</ul>
 			</div>
 			</div>
 			<div class="jdindentdetail-main-infohr"></div>
 			<div class="jdindentdetail-main-infohr"></div>
@@ -558,8 +558,8 @@
 
 
 								<div class="selftmregType" v-model="apply.customerType"
 								<div class="selftmregType" v-model="apply.customerType"
 									:style="apply.customerType==\'ent\' ? \'border: 1px solid #409EFF;color: #409EFF;\' : \'\'"
 									:style="apply.customerType==\'ent\' ? \'border: 1px solid #409EFF;color: #409EFF;\' : \'\'"
-									@click="apply.customerType = \'ent\'">企业<img
-										v-if="apply.customerType==\'ent\'" src="/imgs/sjd.png" alt=""></div>
+									@click="apply.customerType = \'ent\'">企业<img v-if="apply.customerType==\'ent\'"
+										src="/imgs/sjd.png" alt=""></div>
 								<div class="selftmregType" v-model="apply.customerType"
 								<div class="selftmregType" v-model="apply.customerType"
 									:style="apply.customerType==\'person\' ? \'border: 1px solid #409EFF;color: #409EFF;\' : \'\'"
 									:style="apply.customerType==\'person\' ? \'border: 1px solid #409EFF;color: #409EFF;\' : \'\'"
 									@click="apply.customerType = \'person\'">个体户<img
 									@click="apply.customerType = \'person\'">个体户<img

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

@@ -361,7 +361,10 @@
 
 
     },
     },
     created: function() {
     created: function() {
-
+        if (this.$route.query.channelUserId != "") {
+            this.$root.channelUserId = this.$route.query.channelUserId;
+            console.log(this.$route.query.channelUserId,"11111111111");
+        }
     },
     },
     computed: {
     computed: {
 
 

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

@@ -229,7 +229,6 @@
         }
         }
     },
     },
     mounted: function() {
     mounted: function() {
-
         var that = this;
         var that = this;
         var obj = this.$root.copyParams("", "getOssConfig", "/action/tmTools/springBoard");
         var obj = this.$root.copyParams("", "getOssConfig", "/action/tmTools/springBoard");
         this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
         this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
@@ -243,7 +242,7 @@
             that.action = d.data.url;
             that.action = d.data.url;
             console.log(that.action, `oooooooooooooooooooooooooooo`);
             console.log(that.action, `oooooooooooooooooooooooooooo`);
         });
         });
-        if (this.$root.channelUserId != "" && this.$root.channelUserToken != "") {
+        if (this.$root.channelUserId != "") {
             this.handleSizeChange();
             this.handleSizeChange();
         }
         }
     },
     },