23

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/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){