二维码生成页面中心icon没了的bug

一次大型分包更新生产了
合作企业路由
/packageQr/pages/partnership/partnership

员工管理路由
/packageStaff/pages/staff/List/List

油站二维码路由
/packageQr/pages/qrsite/QrCode_xy

加油订单路由改成
/packageOrders/pages/orderList/orderList

components/oil-menu-item.vue

@@ -26,7 +26,6 @@
 			}
 		},
 		created() {
-			console.log('之心')
 			this.calcPrice()
 		},
 		filters: {

manifest.json

@@ -62,7 +62,7 @@
             "urlCheck" : true,
             "es6" : false,
             "postcss" : false,
-			"minified": true
+            "minified" : false
         },
         "usingComponents" : true,
         "permission" : {

packageChart/area-month.vue

@@ -34,8 +34,8 @@
 </template>
 
 <script>
-import uCharts from '@/js_sdk/u-charts/u-charts/u-charts.js';
-import { isJSON } from '@/common/checker.js';
+import uCharts from './common/u-charts/u-charts.js';
+import { isJSON } from './common/checker.js';
 
 var _self;
 var canvaLineA = null;
@@ -43,7 +43,7 @@ export default {
   props: {
     chartData: {
       type: Array,
-      default: []
+      default(){}
     }
   },
 

packageChart/area-time.vue

@@ -34,8 +34,8 @@
 </template>
 
 <script>
-import uCharts from '@/js_sdk/u-charts/u-charts/u-charts.js';
-import { isJSON } from '@/common/checker.js';
+import uCharts from './common/u-charts/u-charts.js';
+import { isJSON } from './common/checker.js';
 
 var _self;
 var canvaLineA = null;
@@ -43,7 +43,7 @@ export default {
   props: {
     chartData: {
       type: Array,
-      default: []
+      default(){}
     }
   },
 

packageChart/operation-analysis/analysis/daily.vue

@@ -78,8 +78,8 @@
 			}
 			return {
 				title: 'picker-view',
-				years: [2020],
-				year: 2020,
+				years: [new Date().getFullYear()],
+				year: new Date().getFullYear(),
 				months: months,
 				dialogModal: '',
 				month: month,

packageChart/operation-analysis/analysis/monthly.vue

@@ -74,8 +74,8 @@
 			}
 			return {
 				title: 'picker-view',
-				years: [2020],
-				year: 2020,
+				years: [new Date().getFullYear()],
+				year: new Date().getFullYear(),
 				months: months,
 				dialogModal: '',
 				month: month,

packageChart/operation-analysis/operation-analysis.vue

@@ -21,7 +21,7 @@
 		</view>
 		<view class="bg-white radius  margin-left margin-right to-top">
 			<view class=" flex ">
-				<view class="padding text-center flex-sub" @tap="routerTo('/pages/orderList/dailyOrder/dailyOrder')">
+				<view class="padding text-center flex-sub" @tap="routerTo('/packageOrders/pages/orderList/dailyOrder/dailyOrder')">
 					<text>交易笔数</text>
 					<view class="padding-sm">
 						<text class="oil-main-color">{{basicData.totalCount}}</text>
@@ -75,7 +75,7 @@
 </template>
 
 <script>
-	import staffApi from '@/api/staff.js'
+	import staffApi from '@/packageStaff/api/staff.js'
 	import cloudSiteApi from '@/api/cloud-site.js'
 	export default {
 		data() {

packageOrders/components/order-item.vue

@@ -11,8 +11,6 @@
 				<view class="flex-treble" @tap="copyId(item.orderID)">
 					{{item.orderID}}<text class="flex-sub padding-left-sm text-right cuIcon-copy text-lg text-red">
 					</text>
-
-
 				</view>
 				<view class="flex-sub text-right cuIcon-right" @tap="toDetails(item.orderID)">
 				</view>

packageOrders/pages/orderList/dailyOrder/dailyOrder.vue

@@ -61,7 +61,7 @@
 
 <script>
 	import cloudSiteApi from '@/api/cloud-site.js'
-	import OrderItem from '@/components/order-item'
+	import OrderItem from '@/packageOrders/components/order-item.vue'
 	import UniLoadMore from '@/components/uni-load-more/uni-load-more.vue'
 
 	export default {

packageOrders/pages/orderList/orderList.vue

@@ -61,7 +61,7 @@
 
 <script>
 	import cloudSiteApi from '@/api/cloud-site.js'
-	import OrderItem from '@/components/order-item'
+	import OrderItem from '@/packageOrders/components/order-item.vue'
 	import UniLoadMore from '@/components/uni-load-more/uni-load-more.vue'
 
 	export default {

packageQr/components/OrderOil.vue

@@ -138,7 +138,9 @@
 
 				this.price = this.selected.xkPrice ? this.selected.xkPrice : this.selected.lvPrice
 				this.money.total = this.vol * this.selected.standardPrice
-				this.money.discount = this.money.total - this.vol * (this.selected.standardPrice - this.price)
+				// this.money.discount = this.money.total - this.vol * (this.selected.standardPrice - this.price)
+				// this.money.realPay = (this.money.total - this.money.discount).toFixed(2)
+				this.money.discount = this.vol * (this.selected.standardPrice - this.price)
 				this.money.realPay = (this.money.total - this.money.discount).toFixed(2)
 				console.log('总金额', '折扣', '实际支付')
 			}

packageQr/components/company-item.vue

@@ -54,12 +54,12 @@
 		methods: {
 			oiling() {
 				uni.navigateTo({
-					url: `/pages/partnership/partner-group/partner-group?id=${this.company.companyId}`
+					url: `/packageQr/pages/partnership/partner-group/partner-group?id=${this.company.companyId}`
 				})
 			},
 			joinqr() {
 				uni.navigateTo({
-					url: `/pages/partnership/join-qr/join-qr?id=${this.company.companyId}&name=${this.company.companyName}`
+					url: `/packageQr/pages/partnership/join-qr/join-qr?id=${this.company.companyId}&name=${this.company.companyName}`
 				})
 			},
 			makeCall(number){

packageQr/pages/partnership/join-qr/join-qr.vue

@@ -34,7 +34,7 @@
 <script>
 	import partnerApi from '@/api/partner.js'
 	// 引入二维码库
-	import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
+	import tkiQrcode from "../../../components/tki-qrcode/tki-qrcode.vue" //二维码生成器
 	export default {
 		components: {
 			tkiQrcode
@@ -121,6 +121,7 @@
 	.self-tag {
 		position: absolute;
 		right: 0;
+		top: 2em;
 		border-radius: 100upx 0 0 100upx;
 	}
 

packageQr/pages/partnership/partner-group/partner-group.vue

@@ -26,7 +26,7 @@
 <script>
 	import UniLoadMore from '@/components/uni-load-more/uni-load-more.vue'
 	import partnerApi from '@/api/partner.js'
-	import DriverItem from '@/components/driver-item.vue'
+	import DriverItem from '../../../components/driver-item.vue'
 	export default {
 		components: {
 			DriverItem,

packageQr/pages/partnership/partnership.vue

@@ -17,7 +17,7 @@
 <script>
 
 	import partnerApi from '@/api/partner.js'
-	import companyItem from '@/components/company-item.vue'	
+	import companyItem from '../../components/company-item.vue'	
 	export default {
 		components: {
 			companyItem

packageQr/pages/qrsite/QrCode_xy.vue

@@ -89,11 +89,10 @@
 </template>
 
 <script>
-	import OrderOilForm from '@/components/OrderOil.vue'
+	import OrderOilForm from '@/packageQr/components/OrderOil.vue'
 	// 引入二维码库  
-	import QR from "@/utils/wxqrcode.js" // 二维码生成器  
 	import cloudSiteApi from '@/api/cloud-site.js'
-	import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
+	import tkiQrcode from "@/packageQr/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
 
 	export default {
 		components: {
@@ -182,15 +181,9 @@
 			},
 			qrR() {
 				console.log('5555')
-			},
-			qrInit() {
-				this.qrImg = QR.createQrCodeImg({
-					size: parseInt(300) //二维码大小  
-				})
-				console.log('this.qrImg', this.qrImg)
-				this.modalName = ''
 			}
 		
+
 		}
 	}
 </script>

packageStaff/pages/staff/List/List.vue

@@ -28,9 +28,8 @@
 
 <script>
 	import UniLoadMore from '@/components/uni-load-more/uni-load-more.vue'
-	import staffApi from '@/api/staff.js'
-
-	import StaffItem from '@/components/staff-item'
+	import staffApi from '@/packageStaff/api/staff.js'
+	import StaffItem from '@/packageStaff/components/staff-item.vue'
 	export default {
 		components: {
 

packageStaff/pages/staff/editStaff/addUser.vue

@@ -65,7 +65,7 @@
 </template>
 
 <script>
-import staffApi from '@/api/staff.js'
+import staffApi from '@/packageStaff/api/staff.js'
 export default {
   data() {
     return {

packageStaff/pages/staff/editStaff/editStaff.vue

@@ -64,8 +64,8 @@
 </template>
 
 <script>
-	import StaffItem from '@/components/staff-item'
-	import staffApi from '@/api/staff.js'
+	import StaffItem from '@/packageStaff/components/staff-item.vue'
+import staffApi from '@/packageStaff/api/staff.js'
 	export default {
 		components: {
 			StaffItem,

packageTest/test/test.vue

@@ -0,0 +1,23 @@
+<template>
+	<view>
+		<!-- <web-view src="https://xingka51.oss-cn-hangzhou.aliyuncs.com/applets/cloudSite/yunzhan.jpg"></web-view> -->
+		<web-view class="qrimg-yunzhan" src="https://www.51xingka.net/LSMDRIVER/static/img/yunzhan.jpg" />
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages.json

@@ -10,38 +10,18 @@
 		{
 			"path": "pages/stationDetail/stationDetail",
 			"style": {}
-		}, {
-			"path": "pages/orderList/orderList",
-			"style": {}
-		}, {
-			"path": "pages/temp/temp",
-			"style": {}
 		}, {
 			"path": "pages/login/boforeLogin/boforeLogin",
 			"style": {}
 		}, {
 			"path": "pages/station-info/scan-camera/scan-camera",
 			"style": {}
-		}, {
-			"path": "pages/setup/changePhone/changePhone",
-			"style": {}
-		},
-		{
-			"path": "pages/setup/changePhone/auth",
-			"style": {}
-		},
-		{
-			"path": "pages/setup/setPassword/setPassword",
-			"style": {}
 		},
 		{
 			"path": "pages/startPage/startPage",
 			"style": {}
 		},
 		{
-			"path": "pages/staff/editStaff/editStaff",
-			"style": {}
-		}, {
 			"path": "pages/station-info/station-info",
 			"style": {}
 		}, {
@@ -53,63 +33,36 @@
 			"path": "pages/login/posLogin/posLogin",
 			"style": {}
 		},
-
-		{
-			"path": "pages/staff/editStaff/addUser",
-			"style": {}
-		}, {
-			"path": "pages/orderList/OrderDetail/OrderDetail",
-			"style": {}
-		}, {
-			"path": "pages/staff/List/List",
-			"style": {
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/qrcode/QrCode_xy",
-			"style": {}
-		},
-
-
-
 		{
 			"path": "pages/Auth/Auth",
 			"style": {}
-		}, {
-			"path": "pages/orderList/dailyOrder/dailyOrder",
-			"style": {}
-		}, {
+		}
+	    ,{
             "path" : "pages/test/test",
-			"style": {
+            "style" :                                                                                    
+            {
                 "navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
-		}, {
-			"path": "pages/partnership/partnership",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/partnership/partner-group/partner-group",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": true
-			}
-
-		}, {
-			"path": "pages/partnership/join-qr/join-qr",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": true
-			}
-
         }
     ],
 	"subPackages": [{
+			"root": "packageOrders",
+			"pages": [{
+					"path": "pages/orderList/OrderDetail/OrderDetail",
+					"style": {}
+				},
+				{
+					"path": "pages/orderList/orderList",
+					"style": {}
+				}, {
+					"path": "pages/orderList/dailyOrder/dailyOrder",
+					"style": {}
+				}
+			]
+		},
+		{
 			"root": "packageChart",
 			"pages": [{
 					"path": "operation-analysis/analysis/analysis",
@@ -132,7 +85,100 @@
 					}
 				}
 			]
-	}],
+		},
+		{
+			"root": "packageSecurity",
+			"pages": [{
+					"path": "changePhone/changePhone",
+					"style": {}
+				},
+				{
+					"path": "changePhone/auth",
+					"style": {}
+				},
+				{
+					"path": "setPassword/setPassword",
+					"style": {}
+				}
+			]
+		},
+		{
+			"root": "packageStaff",
+			"pages": [{
+					"path": "pages/staff/List/List",
+					"style": {
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/staff/editStaff/editStaff",
+					"style": {}
+				},
+				{
+					"path": "pages/staff/editStaff/addUser",
+					"style": {}
+				}
+			]
+		},
+
+		{
+			"root": "packageQr",
+			"pages": [{
+					"path": "pages/partnership/partnership",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "pages/partnership/partner-group/partner-group",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": true
+					}
+
+				}, {
+					"path": "pages/partnership/join-qr/join-qr",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": true
+					}
+
+				},
+				{
+					"path": "pages/qrsite/QrCode_xy",
+					"style": {}
+				}
+			]
+
+		},
+		{
+			"root": "packageTest",
+			"pages": [{
+				"path": "temp/temp",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "test/test",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": true
+				}
+
+			}, {
+				"path": "wallet/record/record",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": true
+				}
+
+			}]
+		}
+
+	],
 
 	"globalStyle": {
 		"mp-alipay": {

pages/home/home.vue

@@ -18,7 +18,7 @@
 		</view>
 		<view class="bg-white radius  margin-left margin-right to-top">
 			<view class=" flex ">
-				<view class="padding text-center flex-sub" @tap="routerTo('/pages/orderList/dailyOrder/dailyOrder')">
+				<view class="padding text-center flex-sub" @tap="routerTo('/packageOrders/pages/orderList/dailyOrder/dailyOrder')">
 					<text>今日收款笔数</text>
 					<view class="padding-sm">
 						<text class="oil-main-color">{{userAccount.totalCount}}</text>
@@ -58,39 +58,6 @@
 				</view>
 				<text>{{ item.name }}</text>
 			</view>
-
-			<!-- 		<view class="cu-item" @tap="routerTo('/pages/orderList/orderList')">
-				<view :class="['cuIcon-' + cuIconList[1].cuIcon, 'text-' + cuIconList[1].color]" class="text-sl">
-					<view class="cu-tag badge" v-if="cuIconList[1].badge != 0">
-						<block v-if="cuIconList[1].badge != 1">{{ cuIconList[1].badge > 99 ? '99+' : cuIconList[1].badge }}</block>
-					</view>
-				</view>
-				<text>{{ cuIconList[1].name }}</text>
-			</view>
-			<view class="cu-item">
-				<view :class="['cuIcon-' + cuIconList[2].cuIcon, 'text-' + cuIconList[2].color]" class="text-sl">
-					<view class="cu-tag badge" v-if="cuIconList[2].badge != 0">
-						<block v-if="cuIconList[2].badge != 1">{{ cuIconList[2].badge > 99 ? '99+' : cuIconList[2].badge }}</block>
-					</view>
-				</view>
-				<text>{{ cuIconList[2].name }}</text>
-			</view>
-			<view class="cu-item" @tap="scanQr">
-				<view :class="['cuIcon-' + cuIconList[3].cuIcon, 'text-' + cuIconList[3].color]" class="text-sl">
-					<view class="cu-tag badge" v-if="cuIconList[3].badge != 0">
-						<block v-if="cuIconList[3].badge != 1">{{ cuIconList[3].badge > 99 ? '99+' : cuIconList[3].badge }}</block>
-					</view>
-				</view>
-				<text>{{ cuIconList[3].name }}</text>
-			</view>
-			<view class="cu-item" @tap="routerTo('/pages/qrcode/QrCode_xy')">
-				<view :class="['cuIcon-' + cuIconList[4].cuIcon, 'text-' + cuIconList[4].color]" class="text-sl">
-					<view class="cu-tag badge" v-if="cuIconList[4].badge != 0">
-						<block v-if="cuIconList[4].badge != 1">{{ cuIconList[4].badge > 99 ? '99+' : cuIconList[4].badge }}</block>
-					</view>
-				</view>
-				<text>{{ cuIconList[4].name }}</text>
-			</view>-->
 			<view class="padding-bottom-xl">
 			</view>
 		</view>
@@ -136,32 +103,6 @@
 						badge: 0,
 						name: '加油订单'
 					},
-					// {
-					// 	cuIcon: 'new',
-					// 	path: '暂无',
-					// 	color: 'orange',
-					// 	badge: 0,
-					// 	name: '经营分析'
-					// }, {
-					// 	cuIcon: 'form',
-					// 	color: 'yellow',
-					// 	path: '/pages/orderList/orderList',
-					// 	badge: 0,
-					// 	name: '加油订单'
-					// }, {
-					// 	cuIcon: 'location',
-					// 	path: '/pages/station-info/station-info',
-					// 	color: 'red',
-					// 	badge: 0,
-					// 	name: '油站信息'
-					// },
-					// {
-					// 	cuIcon: 'form',
-					// 	color: 'yellow',
-					// 	path: '/pages/orderList/orderList',
-					// 	badge: 0,
-					// 	name: '加油订单'
-					// },
 					{
 						cuIcon: 'scan',
 						path: '/pages/stationDetail/stationDetail',
@@ -220,20 +161,6 @@
 						console.log('chengg', res)
 					},
 				})
-				// 方便测试
-				// complete: () => {
-				// 	uni.setStorageSync('qrCode', 'XM&1309328197641433088')
-				// 	uni.navigateTo({
-				// 		url: that.scanUrl,
-				// 		fail: (err) => {
-				// 			console.log(err)
-				// 		},
-				// 		success: (res) => {
-				// 			console.log('chengg', res)
-				// 		}
-				// 	})
-				// }
-
 			},
 			// 方便开发
 			// scanQr() {

pages/index/index.vue

@@ -52,7 +52,7 @@
 			this.getUserInfo()
 		},
 		onShow() {
-			uni.preloadPage({url: "/pages/station-info/scan-camera/scan-camera"});
+			// uni.preloadPage({url: "/pages/station-info/scan-camera/scan-camera"});
 			const token = uni.getStorageSync('Authorization')
 			const openid = uni.getStorageSync('device')
 			if (token && openid) {

pages/setup/setup.vue

@@ -91,7 +91,7 @@
 		methods: {
 			changePhone() {
 				uni.navigateTo({
-					url: '/pages/setup/changePhone/auth',
+					url: '/packageSecurity/changePhone/auth',
 					fail: (err) => {
 						console.log(err)
 					}
@@ -113,7 +113,7 @@
 			},
 			setpwd() {
 				uni.navigateTo({
-					url: '/pages/setup/setPassword/setPassword',
+					url: '/packageSecurity/setPassword/setPassword',
 					fail: (err) => {
 						console.log(err)
 					}

pages/stationDetail/stationDetail.vue

@@ -49,7 +49,8 @@
 						<text class="strong padding-right-xs font-16">{{insertResult.oilName}}</text>
 						<text class="padding-right-xs">
 							星油价格:
-							<text class="text-blod oil-main-color">￥{{insertResult.realPrice|numberFilter}}</text>
+							<text class="text-blod oil-main-color" v-if="(insertResult.realPrice-1+1)>0">￥{{insertResult.realPrice|numberFilter}}</text>
+							<text class="text-blod oil-main-color" v-else>无价格</text>
 						</text>
 						<text class="s-rich">市场价￥{{insertResult.standardPrice|numberFilter}}/L</text>
 					</view>
@@ -349,6 +350,7 @@
 				console.log(this.plateNo)
 				console.log(this.carNumber)
 				console.log(this.testResult)
+				if ((this.insertResult.realPrice - 1 + 1) > 0) {
 					if (this.testResult) {
 						const data6 = {
 							...this.driverMsg,
@@ -406,6 +408,12 @@
 							icon: 'none'
 						});
 					}
+				} else {
+					uni.showToast({
+						title: '您选择的油品没有油价，不能加油',
+						icon: 'none'
+					});
+				}
 			},
 			getPayStatus(id) {
 				// 获取订单支付状态

pages/test/test.vue

@@ -1,12 +1,15 @@
 <template>
 	<view>
-		<!-- <web-view src="https://xingka51.oss-cn-hangzhou.aliyuncs.com/applets/cloudSite/yunzhan.jpg"></web-view> -->
-		<web-view class="qrimg-yunzhan" src="https://www.51xingka.net/LSMDRIVER/static/img/yunzhan.jpg" />
+		
 	</view>
 </template>
 
 <script>
+	import UniLoadMore from '@/components/uni-load-more/uni-load-more.vue'
 	export default {
+		components: {
+			UniLoadMore
+		},
 		data() {
 			return {
 				

utils/request.js

@@ -1,16 +1,8 @@
 import axios from 'axios'
 import utils from '@/utils/encode'
 const service = axios.create({
-	// baseURL: 'http://192.168.0.104:48080', // 小杰
-	// baseURL: 'http://a27389c632.qicp.vip',	// 
-	// baseURL: 'http://121.199.72.230:2333/oil',	// 生产,yds测试网关
-	// baseURL: 'http://www.15617055136.top', // 龙龙
-	// baseURL: 'http://172.16.2.143:28080', // 龙龙出差蒲公英，好像用不了
-	// baseURL: 'http://172.16.3.34:48080', // 小杰出差蒲公英，好像用不了
-	
-	// baseURL: 'http://31g4904724.picp.vip', // 龙龙小杰出差花生壳
-	baseURL:'http://www.15617055136.top',// 龙龙// 龙龙// 龙龙
-	// baseURL: 'https://www.51xingka.net/oilApp',//生产
+	// baseURL: 'http://192.168.0.147:48080', // 小杰
+	baseURL: 'https://www.51xingka.net/oilApp',//生产
 	timeout: 5000
 })
 var url = ''