瀏覽代碼

Merge branch '03/03Lebao' into test

lex-xin 4 年之前
父節點
當前提交
18275a1e5f
共有 2 個文件被更改,包括 13 次插入10 次删除
  1. 12 9
      src/views/resetTeaming/modals/subject-preview.vue
  2. 1 1
      src/views/studentManager/studentList.vue

+ 12 - 9
src/views/resetTeaming/modals/subject-preview.vue

@@ -65,7 +65,7 @@
 					</el-row>
 					<el-row style="padding-left: .24rem;" v-if="item.childGoodsList">
 						<el-col v-for="(child, index) in item.childGoodsList" :key="child.name">
-							<span style="font-size: 12px; color: #aaaaaa;">{{ child.name }} {{item.childGoodsList.length - 1 == index ? '' : '、'}}</span>
+							<span style="font-size: 12px; color: #808080;">{{ child.name }} {{item.childGoodsList.length - 1 == index ? '' : '、'}}</span>
 						</el-col>
 					</el-row>
 				</div>
@@ -168,13 +168,13 @@
                             <i class="check_default" :class="[ con.checked ? 'check_active' : '' ]"></i>
                             <div>
                                 {{ con.name }}
-                                <div v-if="con.goodsList" style="font-size: 12px; color: #aaa">
+                                <div v-if="con.goodsList" style="font-size: 12px; color: #808080">
                                     {{ con.goodsList[0].specification }}
                                 </div>
                             </div>
                         </el-col>
                         <el-col :span="6">
-                            <del style="color: #AAA; font-size: 12px;" v-if="con.kitType != 'owned'">¥{{ con.marketPrice | moneyFormat }}</del>
+                            <del style="color: #808080; font-size: 12px;" v-if="con.kitType != 'owned'">¥{{ con.marketPrice | moneyFormat }}</del>
                         </el-col>
                         <el-col :span="6">
                             <span style="color: #1A1A1A" v-if="(con.kitType == 'LEASE')">¥{{ Number((con.depositFee  - con.coupon).toFixed(2)) | moneyFormat }}</span>
@@ -182,10 +182,10 @@
                             <span style="color: #1A1A1A" v-if="con.kitType == 'GROUP'">¥{{ Number((con.price  - con.coupon).toFixed(2)) | moneyFormat }}</span>
                         </el-col>
                     </el-row>
-                    <el-row style="padding-left: 24px; padding-top: 8px; border-top: 1px solid #F0F0F0;" v-if="con.childGoodsList && con.kitType == 'GROUP'">
-						<el-col :span="24" style="font-size: 14px; color: #1A1A1A">赠送辅件</el-col>
+                    <el-row style="padding: 8px 0px 8px 24px; border-top: 1px solid rgb(240, 240, 240);" v-if="con.childGoodsList && con.kitType == 'GROUP'">
+						<el-col :span="24" style="font-size: 14px; color: #1A1A1A; padding-bottom: 3px">赠送辅件</el-col>
 						<el-col>
-							<span style="font-size: 12px; color: #aaaaaa;">
+							<span style="font-size: 12px; color: #808080;">
                                 {{ con.childGoodsNames }}
                             </span>
 						</el-col>
@@ -211,7 +211,7 @@
                         <i class="check_default" :class="[ instr.checked ? 'check_active' : '' ]"></i>{{ instr.name }}
                     </el-col>
                     <el-col :span="6">
-                        <del style="color: #AAA; font-size: 12px;">¥{{ instr.goodsList[0] ? instr.goodsList[0].marketPrice : 0 | moneyFormat }}</del>
+                        <del style="color: #808080; font-size: 12px;">¥{{ instr.goodsList[0] ? instr.goodsList[0].marketPrice : 0 | moneyFormat }}</del>
                     </el-col>
                     <el-col :span="6">
                         <span style="color: #1A1A1A" v-if="instr.price == 0">免费</span>
@@ -220,7 +220,7 @@
                 </el-row>
                 <el-row style="padding-left: 24px;" v-if="instr.childGoodsList">
 					<el-col>
-						<span v-for="(child, index) in instr.childGoodsList" :key="child.id" style="font-size: 12px; color: #aaaaaa;">{{ child.name }} {{instr.childGoodsList.length - 1 == index ? '' : ','}}</span>
+						<span v-for="(child, index) in instr.childGoodsList" :key="child.id" style="font-size: 12px; color: #808080;">{{ child.name }} {{instr.childGoodsList.length - 1 == index ? '' : ','}}</span>
 					</el-col>
 				</el-row>
             </div>
@@ -1167,7 +1167,7 @@ export default {
 
     del {
         font-size: 14px;
-        color: #aaa;
+        color: #808080;
         font-weight: bold;
     }
 
@@ -1216,6 +1216,8 @@ export default {
             display: block;
             content: ' ';
             background: url("../../../assets/images/icon_checkbox.png") no-repeat center;
+            background-color: #fff;
+			border: 1px solid #e9eaef;
             background-size: contain;
         }
     }
@@ -1224,6 +1226,7 @@ export default {
             display: block;
             content: ' ';
             background: url("../../../assets/images/icon_radio.png") no-repeat center;
+            border: 1px solid transparent;
             background-size: contain;
         }
     }

+ 1 - 1
src/views/studentManager/studentList.vue

@@ -621,7 +621,7 @@
       </span>
     </el-dialog>
 
-    <el-dialog title="协议下载" :visible.sync="protocolVisible" width="600px">
+    <el-dialog title="协议下载" :visible.sync="protocolVisible" width="650px">
       <div v-if="protocolVisible">
         <!-- <el-alert
           title="点击下载"