123

igirl-channel-jdweb/app/front/entry/index.ejs

@@ -54,12 +54,15 @@
 
 	<div id="app" v-loading.fullscreen.lock="loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="app-main"
 		style="visibility:hidden">
-		<div class="jc_hd" v-show="headerHidden"></div>
-		<transition name="slide-fade">
-			<router-view></router-view>
-		</transition>
-		<div class="jdc-footer" v-show="headerHidden"></div>
-
+		<div>
+			<el-scrollbar class="page-component__scroll" style="marginTop:0; height: 100%;">
+				<div class="jc_hd" v-show="headerHidden"></div>
+				<transition name="slide-fade">
+					<router-view></router-view>
+				</transition>
+				<div class="jdc-footer" v-show="headerHidden"></div>
+			</el-scrollbar>
+		</div>
 	</div>
 
 	<script src="/js/cropper/index.js"></script>

igirl-channel-jdweb/app/front/entry/public/css/index.css

@@ -17,3 +17,17 @@
     width: 100%;
     min-height: 390px;
 }
+
+.page-component__scroll {
+    height: calc(100% - 40px);
+    margin-top: 40px;
+}
+
+.page-component__scroll .el-scrollbar__wrap {
+    overflow-x: hidden;
+}
+
+#app>div {
+    height: 100vh;
+    overflow: hidden;
+}
\ No newline at end of file

igirl-channel-jdweb/app/front/vues/pages/bycnoticeindex/bycnoticeindex.js

@@ -293,7 +293,7 @@
       console.log(url);
       */
       this.$router.push({
-        path: "jdbycnoticedetailtm", query: {
+        path: `/${this.$root.channelName}/jdbycnoticedetailtm`, query: {
           name:row.sbmc,
           sbqh:row.ggqh,
           imgurl:row.linkurl,
@@ -301,15 +301,9 @@
       });
     },
     backbycnoticetm(){
-      var localurl = location.href;
-      console.log(localurl);
-      var base = localurl.split("bycnoticeindex");
-      var url = base[0] + "/bycnoticetm";
-      console.log(base);
-      console.log(url);
       this.$root.pushx({
         title: "",
-        name: "/jdbycnoticetm"
+        name: `/${this.$root.channelName}/jdbycnoticetm`
       });
     }
   },

igirl-channel-jdweb/app/front/vues/pages/jdbycdetailtm/jdbycdetailtm.css

@@ -386,4 +386,8 @@
 .jdbycdetailtm-breadcrumb .el-breadcrumb__item .el-breadcrumb__inner{
     font-size: 16px;
     color:#62b5db;
+}
+
+.bycdirectsearch .el-tabs__content{
+    background: none;
 }
\ No newline at end of file

igirl-channel-jdweb/app/front/vues/pages/jdbycdetailtm/jdbycdetailtm.js

@@ -101,7 +101,7 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       });
-      var obj = this.$root.copyParams(obj,"getCompanyInfoNoUser","/action/tmQuery/springBoard");
+      var obj = this.$root.copyParams(obj, "getCompanyInfoNoUser", "/action/tmQuery/springBoard");
       this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
         loading.close();
         if (d.status == 0) {
@@ -113,7 +113,7 @@
             that.companyInfo.name = name;
             that.showMask = true;
           }
-        }else{
+        } else {
           that.$message.warning(d.msg);
         }
       }).catch(function (e) {
@@ -134,7 +134,8 @@
         zcggqh: row.zcgg
       };
       var that = this;
-      this.$root.postReq("/web/bytmqueryCtl/noticezcggsearch", obj).then(function (d) {
+      var obj = this.$root.copyParams(obj, "noticezcggsearch", "/action/tmQuery/springBoard");
+      this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
         if (d.status == 0) {
           console.log(d);
           that.sbmc = d.data.sbmc;
@@ -166,7 +167,8 @@
         csggqh: row.csgg
       };
       var that = this;
-      this.$root.postReq("/web/bytmqueryCtl/noticesearch", obj).then(function (d) {
+      var obj = this.$root.copyParams(obj, "noticesearch", "/action/tmQuery/springBoard");
+      this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
         if (d.status == 0) {
           console.log(d);
           that.sbmc = d.data.sbmc;
@@ -229,7 +231,7 @@
       background: 'rgba(0, 0, 0, 0.7)'
     });
     var obj = this.$root.copyParams(obj, "tradeMarkDetail", "/action/tmQuery/springBoard");
-    
+
     this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
       loading.close();
       if (d.data.detaildata[0]) {

igirl-channel-jdweb/app/front/vues/pages/jdbycquerytm/jdbycquerytm.html

@@ -250,7 +250,7 @@
                                     </el-button>
                                 </div>
                             </el-tab-pane>
-                            <el-tab-pane label="商品/服务项" name="six" style="width: 620px;">
+                            <!-- <el-tab-pane label="商品/服务项" name="six" style="width: 620px;">
                                 <div style="position: relative;float:left">
                                     <el-input class="input-input" v-model="nclfuwu"
                                         style="width: 518px;height: 100%;border:1px solid #bbbbbb;border-right:none;"
@@ -264,11 +264,7 @@
                                                 accept="image/png, image/jpeg, image/gif, image/jpg"
                                                 @change="uploadImg($event, 1)">
                                         </div>
-                                        <!-- <el-button class="leibie-btn" slot="append" @click="checkClick">全部类别
-                                <i class="iconfont cqtm-down">
-                                    &#xe664;
-                                </i>
-                            </el-button> -->
+                                       
                                     </el-input>
                                 </div>
                                 <div>
@@ -276,7 +272,7 @@
                                         @click="nclFuwusearchClick" style="margin-left: 0px !important;">检索
                                     </el-button>
                                 </div>
-                            </el-tab-pane>
+                            </el-tab-pane> -->
                         </el-tabs>
                         <div class="search-navArr">
                             <div @click="showznfx" v-if="0">批量检索</div>

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

@@ -109,8 +109,8 @@
                 inputDate: null,
                 startTime: null,
                 entTime: null,
-                icbcStartTime:null,
-                icbcEntTime:null,
+                icbcStartTime: null,
+                icbcEntTime: null,
                 checkedStatus: null,
                 /**$ */
                 CreateDate: null,
@@ -593,7 +593,7 @@
                     if (d.status == 0 && d.data) {
                         this.tableData = d.data;
                         /* 没有分页参数 需要重新改*/
-                        this.countPage = 30 || d.data.length;
+                        this.countPage = d.dataCount;
                         d.data.map((item, index) => {
                             if (item.submitTime) {
                                 item.submitTime = new Date(item.submitTime).toLocaleString('chinese', { hour12: false });