fix

build/utils.js

@@ -30,7 +30,7 @@ exports.cssLoaders = function (options) {
   }
 
   // generate loader string to be used with extract text plugin
-  function generateLoaders (loader, loaderOptions) {
+  function generateLoaders(loader, loaderOptions) {
     const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader]
 
     if (loader) {
@@ -58,7 +58,15 @@ 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'),

src/main.js

@@ -13,7 +13,7 @@ import back from './components/back.vue'
 import backIndex from './components/backindex.vue'
 import Vant from 'vant'
 import clipboard from 'clipboard'
-import 'vant/lib/index.css'
+import 'vant/lib/index.less'
 import wx from 'weixin-js-sdk'
 import VConsole from 'vconsole';
 import request from "@/utils/request"
@@ -63,14 +63,16 @@ router.beforeEach((to, from, next) => {
         if (!localStorage.getItem('userId')) { // 判断当前用户的登录信息userId是否存在
             console.log('无userId')
             next('/Login')
-        } else if (!localStorage.getItem('openid')) {
+        }
+        else if (!localStorage.getItem('openid')) {
             console.log('无openId')
             // overallExample.getOpenid()
             getWxOpenId().then(() => {
                 next()
             })
             console.log('overallExample.getOpenid()走完了')
-        } else {
+        }
+        else {
             console.log('什么都有')
             next()
         }

src/pages/express.vue

@@ -224,7 +224,7 @@ export default {
 	async mounted() {
 		const res = await getSendInfo({ userId: localStorage.getItem("userId") })
 		if (res.code == 444) {
-			Toast(res.msg)
+			Toast(res.error)
 		} else {
 			this.SendInfoValue = res
 		}
@@ -301,7 +301,8 @@ export default {
 						let result1 = res.resultStr.split(",");
 						result = result1[result1.length - 1];
 					}
-					this.authorization = value
+					console.log(result, '======财务核销码返回结果')
+					this.authorization = result
 				},
 				error: function (res) {
 					console.log(res, 'error++++++++++');
@@ -441,6 +442,10 @@ export default {
 				this.getPrintersList = getPrinters.data.map((item) => {
 					return { printerName: item.printerName, id: item.id }
 				})
+				if (this.getPrintersList.length === 1) {
+					this.shipServe(this.getPrintersList[0].id)
+					return
+				}
 				this.printerShow = true
 			} else {
 				Toast('系统异常')
@@ -460,8 +465,25 @@ export default {
 			this.printerName = e.printerName;
 			this.printerId = e.id;
 
+			await this.shipServe(e.id)
+
+			// 开始走打印机面单
+			// try {
+			// 	const res = await storagePrintSmallTab({ printId: e.id })
+			// 	if (res.msg == 'success') {
+			// 		Toast('打印成功')
+			// 	}
+			// 	console.log(res, '最后')
+			// 	this.printerShow = false;
+			// } catch (error) {
+
+			// }
+			// toask.clear();
+		},
+
+		async shipServe(printId) {
 			//先走基础打印
-			Toast.loading({
+			const $toast = Toast.loading({
 				message: '保存中...',
 				forbidClick: true,
 				duration: 0
@@ -494,27 +516,16 @@ export default {
 				addresseeName: this.transmitMessageVlaue.addresseeName,//寄件人姓名
 				addresseePhone: this.transmitMessageVlaue.addresseePhone,//收件人手机号
 				verificationCode: this.authorization, //财务核销码
-				printId: e.id
+				printId: printId
 			}
 			const res = await saveMailDo({ ...parmas })
 			if (res.msg == 'success') {
 				Toast('寄件成功')
 				this.$router.push('/')
+			} else {
+				this.$toast(res.error)
 			}
-			Toast.clear()
-
-			// 开始走打印机面单
-			// try {
-			// 	const res = await storagePrintSmallTab({ printId: e.id })
-			// 	if (res.msg == 'success') {
-			// 		Toast('打印成功')
-			// 	}
-			// 	console.log(res, '最后')
-			// 	this.printerShow = false;
-			// } catch (error) {
-
-			// }
-			// toask.clear();
+			$toast.clear()
 		}
 	},
 

src/pages/logisticslist.vue

@@ -1,15 +1,16 @@
 <template>
 	<div>
 		<div class="content">
-			<div class="tab">
-				<div>
-					<p @click="tab(1)" :class="[index == 1 ? 'active' : '']">外部件</p>
-					<p @click="tab(2)" :class="[index == 2 ? 'active' : '']">内部件</p>
-				</div>
-			</div>
+			<van-tabs v-model="index" @click="tab">
+				<van-tab title="外部件" :name="1">
+				</van-tab>
+				<van-tab title="内部件" :name="2">
+				</van-tab>
+			</van-tabs>
+
 			<!-- 订单列表 -->
 			<div class="batch_box" @scroll.passive="getScroll($event)"
-				style=" height: calc(100vh - 40px);overflow-y: auto;">
+				style=" height: calc(100vh - 44px);overflow-y: auto;">
 				<van-pull-refresh v-model="refreshLoading" @refresh="onRefresh">
 					<div class="jjlist" v-for="item in mailList">
 						<div class="listinfo" @click="mailDetail(item)">
@@ -200,6 +201,7 @@ export default {
 <style lang="less" scoped="">
 .content {
 	font-size: .3rem;
+	width: 100vw;
 	//padding: .33rem;
 	// padding: .33rem .33rem 1.2rem;
 

src/pages/search.vue

@@ -381,5 +381,6 @@ export default {
 	font-size: 16px;
 	color: #969799;
 	text-align: center;
+	margin-top: 20px;
 }
 </style>