Forráskód Böngészése

组件样式全局修改

sunChengjie 1 éve
szülő
commit
ee7b84629e

+ 10 - 1
build/utils.js

@@ -58,7 +58,16 @@ exports.cssLoaders = function (options) {
   return {
     css: generateLoaders(),
     postcss: generateLoaders(),
-    less: generateLoaders('less'),
+    less: generateLoaders('less', {
+      modifyVars: {
+        // 直接覆盖变量
+        'button-info-border-color': '#00c4b8',
+        'button-info-background-color': '#00c4b8',
+        'checkbox-checked-icon-color': '#00c4b8',
+        'radio-checked-icon-color': '#00c4b8',
+        'tabs-default-color': '#00c4b8',
+      },
+    }),
     sass: generateLoaders('sass', { indentedSyntax: true }),
     scss: generateLoaders('sass'),
     stylus: generateLoaders('stylus'),

+ 12 - 0
src/App.vue

@@ -67,5 +67,17 @@ export default {
 	width: 100%;
 	max-width: 7.5rem;
 	margin: 0 auto;
+
+
+}
+
+:root {
+	--van-primary-color: #ccc;
+	/* 你想要的主色 */
+	--van-background-color: #000;
+	/* 背景色 */
+	--van-text-color: #fff;
+	/* 文字色 */
+	/* 更多颜色变量 */
 }
 </style>

+ 15 - 15
src/main.js

@@ -14,8 +14,8 @@ import banner from './components/banner.vue'
 import back from './components/back.vue'
 import backIndex from './components/backindex.vue'
 import Vant from 'vant'
-import 'vant/lib/index.css'
-import request from "@/utils/request" 
+import 'vant/lib/index.less'
+import request from "@/utils/request"
 import VConsole from 'vconsole';
 
 const vconsole = new VConsole()
@@ -38,7 +38,7 @@ import 'swiper/swiper.min.css' //样式文件
 // 在man.js中注册 weixin-jsapi
 //Vue.prototype.wx = wx
 import wx from 'weixin-js-sdk'
-Vue.prototype.$wx= wx
+Vue.prototype.$wx = wx
 
 //Vue.prototype.common=common
 // Vue.http.options.emulateJSON = true;
@@ -73,19 +73,19 @@ new Vue({
 })
 /* router.beforeEach(function(to, from, next) {
   if (to.meta.needLogin) {
-    //页面是否登录
-    if (sessionStorage.getItem("userId")) {
-      //存储中是否有token(uid)数据
-      next(); //表示已经登录
-    } else {
-      //next可以传递一个路由对象作为参数 表示需要跳转到的页面
-      next({
-        path: "Login"
-      });
-    }
+	//页面是否登录
+	if (sessionStorage.getItem("userId")) {
+	  //存储中是否有token(uid)数据
+	  next(); //表示已经登录
+	} else {
+	  //next可以传递一个路由对象作为参数 表示需要跳转到的页面
+	  next({
+		path: "Login"
+	  });
+	}
   } else {
-    //表示不需要登录
-    next(); //继续往后走
+	//表示不需要登录
+	next(); //继续往后走
   }
 }); */
 

+ 1 - 1
src/pages/components/Waitsent.vue

@@ -184,10 +184,10 @@ export default {
         ,
         // 签收控制显示
         onReceiving(value) {
-
             this.onReceivingVlaue = value
             this.receiving = true;
             this.selectedOption = this.options[0];
+            this.$refs.scrollRefresh.onRefresh()
         },
         // 签收选择确认弹框
         onConfirm(value) {

+ 5 - 0
src/pages/my.vue

@@ -166,4 +166,9 @@ body {
 		}
 	}
 }
+
+.van-icon {
+	background-color: #00c4b8;
+	border-color: #00c4b8;
+}
 </style>

+ 1 - 1
src/pages/new/batched.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="container">
         <div>
-            <div>批次号生成</div>
+            <div style="padding-top: 15px;">批次号生成</div>
             <div class="number">{{ BatDispatchBatchNo }}</div>
             <div class="wenzi">批次内包含以下快件:</div>
             <div class="middle-box" style="">

+ 22 - 2
src/pages/new/scannerResult.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="container">
-        <van-cell-group>
+        <van-cell-group class="shujuList" style="height: calc(100vh - 40px); overflow-y: auto;">
             <van-cell title="快递单号" :value="list.dispatchNo" />
             <van-cell title="快递公司" :value="list.expressCompany" />
             <van-cell title="收件人姓名" :value="list.recipient" />
@@ -19,7 +19,7 @@
             <van-cell title="快递备注" :value="list.remark" />
         </van-cell-group>
 
-        <van-button type="primary" size="large" @click="backHome">返回首页</van-button>
+        <van-button class="backHomePage" type="primary" size="large" @click="backHome">返回首页</van-button>
     </div>
 </template>
 
@@ -43,3 +43,23 @@ export default {
     },
 };
 </script>
+
+<style lang="less" scoped>
+.container {
+    height: 100vh;
+
+    .shujuList {
+        height: 100vh;
+    }
+
+    .backHomePage {
+        position: fixed;
+        height: 40px;
+        width: 100vw;
+        bottom: 0;
+        left: 0;
+        border-radius: 5px;
+        padding: 0 20px;
+    }
+}
+</style>

+ 20 - 10
src/pages/new/storage.vue

@@ -22,13 +22,13 @@
                 <van-field :value="onGroupObject.NAME" @focus="onFocus" name="NAME" label="收件人姓名"
                     placeholder="请输入收件人姓名" />
 
-                <van-field :value="onGroupObject.departmentName" name="departmentId" label="收件人部门" placeholder="占位"
+                <van-field :value="onGroupObject.departmentName" name="departmentId" label="收件人部门" placeholder="自动填充"
                     readonly />
-                <van-field :value="onGroupObject.mailRoomName" name="mailRoom" label="所属收发室" placeholder="占位"
+                <van-field :value="onGroupObject.mailRoomName" name="mailRoom" label="所属收发室" placeholder="自动填充"
                     readonly />
-                <van-field :value="onGroupObject.mailFloor" name="departmentId" label="收件人楼层" placeholder="占位"
+                <van-field :value="onGroupObject.mailFloor" name="departmentId" label="收件人楼层" placeholder="自动填充"
                     readonly />
-                <van-field :value="onGroupObject.seat_no" name="sendSeat" label="收件人座位" placeholder="占位" readonly />
+                <van-field :value="onGroupObject.seat_no" name="sendSeat" label="收件人座位" placeholder="自动填充" readonly />
 
                 <van-field name="expressType" label="快件类型">
                     <template #input>
@@ -60,11 +60,10 @@
 
                 <van-field v-model="object.remark" label="快递备注" name="remark" placeholder="请输入快递备注" />
 
-                <div style=" display: flex; justify-content: space-around; background-color: #fff;  padding: 10px 0;">
-                    <van-button size="small" style="border-radius: 5px; width: 190px;" block type="info"
-                        native-type="submit">保存/打印小标签并添加下一个</van-button>
-                    <van-button size="small" style="width: 130px; border-radius: 5px;" block type="info"
-                        native-type="submit">保存并打印小标签</van-button>
+                <div
+                    style=" display: flex; justify-content: space-around; background-color: #fff;  padding: 10px 20px;">
+                    <van-button size="small" style="border-radius: 5px; width: 100vw; " block type="info"
+                        native-type="submit">保存并打印小标签并添加下一个</van-button>
                 </div>
             </van-form>
         </div>
@@ -252,6 +251,8 @@ export default {
 
             } else if (res.msg == 'already') {
                 this.$toast('该账号已添加过')
+            } else if (res.code == 444) {
+                this.$toast(res.error)
             }
             this.object.value4 = this.value14
         },
@@ -345,4 +346,13 @@ export default {
         }
     }
 }
-</style>
+
+// /deep/.van-checkbox__icon--checked .van-icon {
+//     background-color: #00c4b8;
+//     border-color: #00c4b8;
+// }
+
+// /deep/.van-radio__icon--checked .van-icon {
+//     background-color: #00c4b8;
+//     border-color: #00c4b8;
+// }</style>