Skip to content

Z
zhichan
Commit 7e729d77 by 刘泽奇
Options

23

parent c54be99a
Showing with 155 additions and 27 deletions
igirl-channel-jdweb/app/front/entry/public/css/pagecom.css
This source diff could not be displayed because it is too large. You can view the blob instead.
igirl-channel-jdweb/app/front/vues/pages/jdindentdetail/jdindentdetail.css
......@@ -526,3 +526,15 @@
.jdindentdetail-drawer .selftmreg_main .el-form-item{
margin-bottom: 20px !important;
}
.popannouncementsText{
line-height: 26px;
margin: 0 auto;
font-size: 14px;
font-family: PingFangSC-Regular;
font-weight: 400;
color: rgba(74,74,74,1);
width: 100%;
padding: 0 20px;
}
igirl-channel-jdweb/app/front/vues/pages/jdindentdetail/jdindentdetail.html
......@@ -238,7 +238,7 @@
<gsb-upload v-if="form.tmFormType == 3" style="float:left;" flag="picUrl" ref="picUrl"
:d="d" @setKey="setKey" :action="action" filetype="image/jpeg" :ifshowlist="false"
@uploadsuccess="uploadsuccess" @error="error">
<el-button size="mini" style="border-radius:0;color: #666666;">手动上传
<el-button size="mini" style="border-radius:100px;color: #666666;">手动上传
</el-button>
</gsb-upload>
<gsb-upload v-if="form.tmFormType == 4 || form.tmFormType == 5" style="float:left;"
......@@ -253,7 +253,7 @@
</div>
</gsb-upload>
<div style="float:left;margin-left:10px;" v-if="form.tmFormType == 3">
<el-button @click="word2pic" style="border-radius:0;color: #666666;" size="mini">
<el-button @click="word2pic" style="border-radius:100px;color: #666666;" size="mini">
自动生成
</el-button>
</div>
......@@ -288,7 +288,7 @@
</el-drawer>
<el-drawer :visible.sync="announcementsImgType" width="60%" append-to-body>
<h1 style="width:100%;text-align: center;">上传商标图样注意事项</h1>
<div class="announcementsText">
<div class="popannouncementsText">
图样文件格式应为jpg，图形应清晰，图样文件大小应小于“<span>200KB</span>”，且图形像素介于“<span>600X600 -
1500X1500</span>”之间，如果通过扫描获得图样的，应按
<span>24</span>位彩色，<span>300dpi</span>分辨率扫描符合《商标法》及其实施条例规定的图形（图形清晰，大于5X5厘米且小于10X10厘米），申请人（或代理人）应确保扫描后的图
......
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.html
......@@ -133,8 +133,7 @@
:visible.sync="showUploadStuff">
<div style="padding:20px 0;text-align: center">
<el-form label-position="left" ref="stuff" :model="stuff" class="demo-ruleForm"
label-width="120px">
<el-form label-position="left" ref="stuff" :model="stuff" class="demo-ruleForm" label-width="120px">
<!-- 头部 -->
<!-- <el-form-item label-width="140px" label="申请人类型"
......@@ -157,9 +156,9 @@
@mouseleave="mouseLeaveDemo(1,\'a\')">
<img class="upload-applyimg" v-if="stuff.businessLicensePic"
:src="stuff.businessLicensePic?stuff.businessLicensePic:\'/imgs/sbzc/yyzzD.png\'" />
<gsb-upload v-else flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" :action="action"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error">
<gsb-upload v-else flag="yyzz" ref="yyzz" :d="d" @setKey="setKey"
:action="action" filetype="image/jpeg" :ifshowlist="false"
@uploadsuccess="uploadsuccess" @error="error">
<div class="upload-button" @click="loadingKey = 0">
<div><i class="el-icon-plus"></i></div>
<div>(需盖公章)</div>
......@@ -176,7 +175,8 @@
</gsb-upload>
</div>
</div>
<div class="upload-img" @mouseover="mouseOverDemo(1)" @mouseleave="mouseLeaveDemo(1)">
<div class="upload-img" @mouseover="mouseOverDemo(1)"
@mouseleave="mouseLeaveDemo(1)">
<img
:src="stuff.customerType == \'ent\' ? \'/imgs/sbzc/yyzz1.png\' : \'imgs/sbzc/yyzz.png\'" />
<div v-if="toViewImgKey == 1" class="toViewImg"
......@@ -210,7 +210,8 @@
</gsb-upload>
</div>
</div>
<div class="upload-img" @mouseover="mouseOverDemo(4)" @mouseleave="mouseLeaveDemo(4)">
<div class="upload-img" @mouseover="mouseOverDemo(4)"
@mouseleave="mouseLeaveDemo(4)">
<img src="/imgs/sbzc/sfz.png" />
<div v-if="toViewImgKey == 4" class="toViewImg"
@click="toViewImg(\'/imgs/sbzc/sfzD.png\')">查看大图</div>
......@@ -235,8 +236,7 @@
<div>(需盖公章)</div>
</div>
</gsb-upload>
<div class="upload-dialog"
v-show="stuff.gzwtsUrl && toViewImgKey == \'b\'">
<div class="upload-dialog" v-show="stuff.gzwtsUrl && toViewImgKey == \'b\'">
<div @click="window.open(stuff.gzwtsUrl)">查看大图</div>
<gsb-upload flag="wts" ref="wts" :d="d" @setKey="setKey" :action="action"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
......@@ -245,7 +245,8 @@
</gsb-upload>
</div>
</div>
<div class="upload-img" @mouseover="mouseOverDemo(2)" @mouseleave="mouseLeaveDemo(2)">
<div class="upload-img" @mouseover="mouseOverDemo(2)"
@mouseleave="mouseLeaveDemo(2)">
<img
:src="stuff.customerType == \'ent\' ? \'/imgs/sbzc/wts1.png\' : \'imgs/sbzc/wts.png\'" />
<div v-if="toViewImgKey == 2" class="toViewImg"
......@@ -271,8 +272,7 @@
<div>(需盖公章)</div>
</div>
</gsb-upload>
<div class="upload-dialog"
v-show="stuff.smwjUrl && toViewImgKey == \'c\'">
<div class="upload-dialog" v-show="stuff.smwjUrl && toViewImgKey == \'c\'">
<div @click="window.open(stuff.smwjUrl)">查看大图</div>
<gsb-upload flag="yxq" ref="yxq" :d="d" @setKey="setKey" :action="action"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
......@@ -281,7 +281,8 @@
</gsb-upload>
</div>
</div>
<div class="upload-img" @mouseover="mouseOverDemo(3)" @mouseleave="mouseLeaveDemo(3)">
<div class="upload-img" @mouseover="mouseOverDemo(3)"
@mouseleave="mouseLeaveDemo(3)">
<img src="/imgs/sbzc/yxq.png" />
<div v-if="toViewImgKey == 3" class="toViewImg"
@click="toViewImg(\'/imgs/sbzc/yxqD.png\')">查看大图</div>
......@@ -290,7 +291,8 @@
<div style="clear:both;"></div>
<el-dialog title="" :visible.sync="toViewImgType" center width="72%" append-to-body>
<img :src="toViewImgSrc" style="max-width:100%;display: block;margin: 0 auto;" alt="">
<img :src="toViewImgSrc" style="max-width:100%;display: block;margin: 0 auto;"
alt="">
</el-dialog>
</div>
</div>
......@@ -308,7 +310,120 @@
</el-tab-pane>
<el-tab-pane label="工商订单" name="second">配置管理</el-tab-pane>
<el-tab-pane label="工商订单" name="second">
<div class="jdindentlist">
<div class="jdindentlist-inquire">
<div class="jdindentlist-inquire-form">
<div><span>订单编号：</span>
<el-input v-model="channelServiceNo" placeholder="请输入内容"></el-input>
</div>
<div><span>交付单号：</span>
<el-input v-model="deliveryOrderNo" placeholder="请输入内容"></el-input>
</div>
<div><span>业务类型：</span>
<el-select v-model="itemName" placeholder="请选择">
<el-option v-for="item in businessType" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
<div><span>下单时间：</span>
<div class="block">
<span class="demonstration"></span>
<el-date-picker v-model="CreateDate" @change="dateChecked(CreateDate)" type="daterange"
align="right" start-placeholder="起始" end-placeholder="结束"
:picker-options="pickerOptions">
</el-date-picker>
</div>
</div>
<div><span>商标名称：</span>
<el-input v-model="tmName" placeholder="请输入内容"></el-input>
</div>
<div><span>申请人：</span>
<el-input v-model="name" placeholder="请输入内容"></el-input>
</div>
<div><span>交付状态：</span>
<el-select v-model="deliveryStatus" placeholder="请选择">
<el-option v-for="item in DeliveryStatus" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
<div><span>交付状态：</span>
<el-select v-model="deliveryStatus" placeholder="请选择">
<el-option v-for="item in DeliveryStatus" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
<!-- <div><span>付款状态：</span>
<el-select v-model="paymentStatus" placeholder="请选择">
<el-option v-for="item in options" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
</div> -->
</div>
<div>
<el-button @click="find()">查询</el-button>
<el-button @click="reset()">重置</el-button>
</div>
</div>
<div class="jdindentlist-null" v-if="!tableData">
<div>
<img src="/imgs/listnull.png" alt="">
</div>
<p>很抱歉，没有查询到您要搜索的内容！您也可以减少筛选范围再尝试~</p>
</div>
<div class="jdindentlist-list" v-else>
<el-table :header-cell-style="{background:\'#F5F5F5;\'}" :data="tableData" style="width: 100%">
<el-table-column prop="channelServiceNo" label="订单编号">
</el-table-column>
<el-table-column prop="deliveryOrderNo" label="交付单号">
</el-table-column>
<el-table-column prop="itemName" label="业务类型">
</el-table-column>
<el-table-column prop="tmName" label="商标名称">
</el-table-column>
<el-table-column prop="nclOneCodes" label="商标类别">
</el-table-column>
<el-table-column prop="nclOneCount" label="商标件数">
</el-table-column>
<el-table-column prop="name" label="申请人">
</el-table-column>
<el-table-column prop="totalSum" label="订单金额">
</el-table-column>
<el-table-column prop="deliveryStatusName" label="交付状态" class-name="dsqcl">
</el-table-column>
<el-table-column prop="CreateDate" label="下单时间">
</el-table-column>
<el-table-column prop="submitTime" label="递交时间" class-name="subtime">
</el-table-column>
<el-table-column prop="address" label="操作">
<template slot-scope="scope">
<el-button v-show="showDetails(scope.$index, scope.row)"
style="border:0;width:100%;color: #0F8EE9;" size="mini"
@click="viewDetails(scope.$index, scope.row)">详情</el-button>
<el-button v-show="showSelf(scope.$index, scope.row)"
style="border:0;color: #0F8EE9;width:100%;margin:0;" size="mini"
@click="uploadMaterials(scope.$index, scope.row)">上传材料</el-button>
<el-button v-show="showSup(scope.$index, scope.row)"
style="border:0;color: #0F8EE9;width:100%;margin:0;" size="mini"
@click="goScheme(scope.$index, scope.row)">确认注册方案</el-button>
<el-button v-show="showReg(scope.$index, scope.row)"
style="border:0;width:100%;color: #0F8EE9;margin:0;" size="mini"
@click="goSelftmreg(scope.$index, scope.row)">去注册</el-button>
</template>
</el-table-column>
</el-table>
<div class="jdindentlist-list-page">
<el-pagination @current-change="handleSizeChange()" :current-page.sync="currentPage"
:page-size="10" background layout="prev, pager, next,jumper" :total="countPage">
</el-pagination>
</div>
</div>
</div>
</el-tab-pane>
</el-tabs>
</div>
\ No newline at end of file
igirl-channel-jdweb/app/front/vues/pages/selftmreg/index.css
......@@ -601,11 +601,11 @@
}
.categoryFrom .el-radio__inner {
border: 1px solid #DDE0E6;
border: 2px solid #DDE0E6;
}
.categoryFrom .el-radio__input.is-checked .el-radio__inner {
border: 3px solid rgb(9, 137, 197);
border: 4px solid rgb(9, 137, 197);
background: none;
}
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.html
......@@ -60,7 +60,7 @@
<gsb-upload v-if="form.tmFormType == 3" style="float:left;" flag="picUrl" ref="picUrl" :d="d"
@setKey="setKey" :action="action" filetype="image/jpeg" :ifshowlist="false"
@uploadsuccess="uploadsuccess" @error="error">
<el-button size="mini" style="border-radius:0;color: #666666;">手动上传</el-button>
<el-button size="mini" style="border-radius:100px;color: #666666;">手动上传</el-button>
</gsb-upload>
<gsb-upload v-if="form.tmFormType == 4 || form.tmFormType == 5" style="float:left;" flag="picUrl"
ref="picUrl" :d="d" @setKey="setKey" :action="action" filetype="image/jpeg" :ifshowlist="false"
......@@ -72,7 +72,7 @@
</div>
</gsb-upload>
<div style="float:left;margin-left:10px;" v-if="form.tmFormType == 3">
<el-button @click="word2pic" style="border-radius:0;color: #666666;" size="mini">自动生成</el-button>
<el-button @click="word2pic" style="border-radius:100px;color: #666666;" size="mini">自动生成</el-button>
</div>
<div style="clear:both;"></div>
<div style="margin-top:15px;width: 120px;" v-loading="loading" v-if="form.tmFormType == 3">
......
igirl-channel-jdweb/gulpfile.js
......@@ -134,11 +134,11 @@ gulp.task("pagecss",function(cbk){
).pipe(minifycss()).pipe(gulp.dest(CSS_PATH+"/"));
});
gulp.task('sass', function(){
return gulp.src(VUECOM_PATH+"/**/*/*.scss")
.pipe(sass())
.pipe(minifycss()).pipe(gulp.dest(CSS_PATH+"/"))
});
// gulp.task('sass', function(){
// return gulp.src(VUECOM_PATH+"/**/*/*.scss")
// .pipe(sass())
// .pipe(minifycss()).pipe(gulp.dest(CSS_PATH+"/"))
// });
gulp.task("springcss",function(cbk){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment