Merge branch 'master' of http://106.14.142.95:3000/wangyuanbo/bt

imcs-bt-be/imcs-business-biz/src/main/resources/mapper_business/base/order/OrderMapper.xml

@@ -120,8 +120,8 @@
         sum(num2) as exceptNum,
         sum(num3) as errMsgNum,
         sum(num4) as todayAmount,
-        sum(num5) as sevenAmount,
-        sum(num6) as sevenNum,
+        sum(num5) as sevenNum,
+        sum(num6) as sevenAmount,
         sum(num7) as deviceNum
         from (
         select count(1) as num1 ,0 as num2,0 as num3,0 as num4,0 as num5,0 as num6, 0 as num7 from bt_order o

imcs-bt-be/imcs-business-biz/src/main/resources/mapper_business/base/productionresource/ProductionresourceMapper.xml

@@ -40,7 +40,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id
-        ,create_time,create_user,update_time,update_user,adv_url,place_id,lineDesc,placeName,img_url,
+        ,create_time,create_user,update_time,update_user,adv_url,place_id,lineDesc,placeName,img_url,org_id,
         compnay_id, module_id, area_id, name, resources_category, code, status, online_status, remark, ip, port, GATHER_TASK_ID, income_today, exception_order_num, cache_storge_num, max_speed, capital_no, capital_name, capital_type, mode_specification, capital_price, production_date, production_no, manufacturer, program_num
     </sql>
 

imcs-bt-fe/imcs-bt-fe/uni-mall/components/show-empty/show-empty.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class='no-course'>
-		<image class='img' src='../../static/images/my_course_empty.png'></image>
+		<image class='img' src='/static/images/my_course_empty.png'></image>
 		<text class='desc' v-if="text">{{text}}~</text>
 	</view>
 </template>

imcs-bt-fe/imcs-bt-fe/uni-mall/pages/device/deviceDetail.vue

@@ -35,11 +35,11 @@
 				</navigator>
 				<navigator class="item">
 					<text class="val">{{statistics.sevenAmount}}</text>
-					<text class="txt">最近七天销售总额</text>
+					<text class="txt">近七天销售额</text>
 				</navigator>	
 				<navigator class="item">
 					<text class="val">{{statistics.sevenNum}}</text>
-					<text class="txt">最近七天订单</text>
+					<text class="txt">近七天订单</text>
 				</navigator>
 			</view>
 		</view>

imcs-bt-fe/imcs-bt-fe/uni-mall/pages/door/door.vue

@@ -6,7 +6,7 @@
 				<view class="fb-type">
 					<view class="type-label">{{array[index]}}</view>
 					<image class="type-icon"
-						src="../../static/images/icon_select.png">
+						src="/static/images/icon_select.png">
 					</image>
 				</view>
 			</view>
@@ -14,7 +14,7 @@
 		
 		<view class="picker">
 			<view class="fb-type">
-			   <text>{{range[0]}} - {{range[1]}}</text>
+			   <text>{{range[0]?range[0]:''}} - {{range[1]?range[1]:''}}</text>
 			   <button type="primary" @click="onShowDatePicker('range')">选择</button>
 			</view>			
 		</view>
@@ -44,7 +44,8 @@
 		data() {			
 			return {
 				array: ['全部', '开门', '关门'],
-				records: [{
+				records: [
+					/*{
 					id: 1,
 					time: '2022-01-08 16:02',
 					action: '开门'
@@ -56,7 +57,8 @@
 					id: 3,
 					time: '2022-01-08 08:08',
 					action: '关门'
-				}],
+				}*/
+				],
 				queryParams: util.initQueryParams(),
 				range: [],
 				totalPages: 1,

imcs-bt-fe/imcs-bt-fe/uni-mall/pages/goods/goods.vue

@@ -26,7 +26,7 @@
 				</view>
 				<view class="section-nav section-attr" @tap="switchAttrPop">
 					<view class="t">请选择规格数量</view>
-					<image class="i" src="../../static/images/address_right.png" background-size="cover"></image>
+					<image class="i" src="/static/images/address_right.png" background-size="cover"></image>
 				</view>
 				<view class="comments" v-if="comment.count > 0">
 					<view class="h">

imcs-bt-fe/imcs-bt-fe/uni-mall/pages/index/index.vue

@@ -200,7 +200,7 @@
 					"media_type": 1,
 					"name": "新用户注册",
 					"link": "/pages/auth/newuser/newuser",
-					"image_url": "../../static/images/slide1.png",
+					"image_url": "/static/images/slide1.png",
 					"content": "新用户注册",
 					"end_time": 1504838914000,
 					"enabled": 1
@@ -210,7 +210,7 @@
 					"media_type": 1,
 					"name": "合作 谁是你的菜",
 					"link": "",
-					"image_url": "../../static/images/slide2.jpg",
+					"image_url": "/static/images/slide2.jpg",
 					"content": "合作 谁是你的菜",
 					"end_time": 1504838914000,
 					"enabled": 1
@@ -220,21 +220,21 @@
 						id: 1,
 						address: "泥城扩路镇223号，三层",
 						status: "1",
-						pic: "../../static/images/device_bg.png"
+						pic: "/static/images/device_bg.png"
 					},
 					{
 						name: "果奶机02",
 						id: 1,
 						address: "泥城扩路镇223号，三层",
 						status: "2",
-						pic: "../../static/images/device_bg.png"
+						pic: "/static/images/device_bg.png"
 					},
 					{
 						name: "果奶机03",
 						id: 1,
 						address: "泥城扩路镇223号，三层",
 						status: "3",
-						pic: "../../static/images/device_bg.png"
+						pic: "/static/images/device_bg.png"
 					},
 				],
 				channel: [{
@@ -276,7 +276,7 @@
 						id: 6,
 						name: "异常订单",
 						sort_order: 6,
-						url: "/pages/ucenter/order/order?id=6",
+						url: "/pages/ucenter/order/order?type=2",
 						val: "1"
 					},
 				]

imcs-bt-fe/imcs-bt-fe/uni-mall/pages/material/material.vue

@@ -154,7 +154,7 @@
 									<view class="fb-type">
 										<view class="type-label">{{equMaterials[index2].mtName}}</view>
 										<image class="type-icon"
-											src="../../static/images/icon_select.png">
+											src="/static/images/icon_select.png">
 										</image>
 									</view>
 								</view>

imcs-bt-fe/imcs-bt-fe/uni-mall/pages/search/search.vue

@@ -22,7 +22,7 @@
 			</view>
 			<view class="serach-keywords search-hot" v-if="!keyword">
 				<view class="h">
-					<text class="title">热门搜索</text>
+					<text class="title"></text>
 				</view>
 				<view class="b">
 					<view :class="'item '+(item.is_hot === 1 ? 'active' : '')" hover-class="navigator-hover" @tap="onKeywordTap"
@@ -316,7 +316,7 @@
 	.no-search {
 		height: auto;
 		overflow: hidden;
-		margin-top: 120rpx;
+		margin-top: 180rpx;
 	}
 
 	.serach-keywords {

imcs-bt-fe/imcs-bt-fe/uni-mall/pages/shopping/selCoupon/selCoupon.vue

@@ -12,8 +12,8 @@
 							<view class="time">有效期至{{item.use_end_date}}</view>
 						</view>
 						<view class="right">
-							<image v-if="item.enabled==1" class='mid-img' src='../../../static/images/coupon_ksy.png'></image>
-							<image v-if="item.enabled==0" class='mid-img' src='../../../static/images/coupon_bky.png'></image>
+							<image v-if="item.enabled==1" class='mid-img' src='/static/images/coupon_ksy.png'></image>
+							<image v-if="item.enabled==0" class='mid-img' src='/static/images/coupon_bky.png'></image>
 						</view>
 					</view>
 					<view class="condition">

imcs-bt-fe/imcs-bt-fe/uni-mall/pages/ucenter/coupon/coupon.vue

@@ -11,9 +11,9 @@
 							<view class="time">有效期至{{item.use_end_date||''}}</view>
 						</view>
 						<view class="right">
-							<image v-if="item.coupon_status==1" class='mid-img' src='../../../static/images/coupon_ksy.png'></image>
-							<image v-if="item.coupon_status==2" class='mid-img' src='../../../static/images/coupon_ysy.png'></image>
-							<image v-if="item.coupon_status==3" class='mid-img' src='../../../static/images/coupon_gq.png'></image>
+							<image v-if="item.coupon_status==1" class='mid-img' src='/static/images/coupon_ksy.png'></image>
+							<image v-if="item.coupon_status==2" class='mid-img' src='/static/images/coupon_ysy.png'></image>
+							<image v-if="item.coupon_status==3" class='mid-img' src='/static/images/coupon_gq.png'></image>
 						</view>
 					</view>
 					<view class="condition">

imcs-bt-fe/imcs-bt-fe/uni-mall/pages/ucenter/order/order.vue

@@ -7,7 +7,7 @@
 				<view class="fb-type">
 					<view class="type-label">{{array[index]}}</view>
 					<image class="type-icon"
-						src="../../static/images/icon_select.png">
+						src="/static/images/icon_select.png">
 					</image>
 				</view>
 			</view>
@@ -19,7 +19,7 @@
 				<view class="fb-type">
 					<view class="type-label">{{deviceList[index2].name}}</view>
 					<image class="type-icon"
-						src="../../static/images/icon_select.png">
+						src="/static/images/icon_select.png">
 					</image>
 				</view>
 			</view>
@@ -28,7 +28,7 @@
 		<view class="picker" style="position: relative;">
 			<view class="label" v-if="isToday">今日订单</view>
 			<view class="fb-type">
-				<text>{{range[0]}} - {{range[1]}}</text>
+				<text>{{range[0]?range[0]:''}} - {{range[1]?range[1]:''}}</text>
 				<button type="primary" @click="onShowDatePicker('range')" :disabled="isToday" >选择</button>
 			</view>
 		</view>
@@ -99,7 +99,8 @@
 				orderCount: 2,
 				orderSum: 0.0,
 				array: ['全部', '开门', '关门'],
-				orderList: [{
+				orderList: [
+					/*{
 					name: '美式咖啡',
 					memberName: '飞起来的虫',
 					orderSn: 'DD202106010',
@@ -126,7 +127,8 @@
 					status: '3',
 					price: '15.0',
 					errorMsg: ''
-				}],
+				}*/
+				],
 				queryParams: util.initQueryParams(),
 				totalPages: 1,
 				totalPages2: 1
@@ -140,14 +142,14 @@
 				this.index = e.detail.value
 			},
 			bindPickerChange2: function(e) {
-				this.index2 = e.detail.value
+				this.index2 = e.detail.value;
 				this.deviceId = this.deviceList[this.index2].id
 				this.orderList = []
 				this.queryParams.current = 1
-				this.queryParams.model.equId = this.deviceId
+				this.queryParams.model.orderEquId = this.deviceId
 				let pages = getCurrentPages();
 				let page = pages[pages.length - 1].$page.fullPath;
-				let oType = page.split('type=')[1]				
+				let oType = page.split('type=')[1]
 				this.getOrderList(oType)
 			},
 			bindDateChange: function(e) {
@@ -186,7 +188,7 @@
 				let oType = page.split('type=')[1]
 				this.getOrderList(oType)
 			},
-			getDeviceList() {
+			getDeviceList(equId) {
 				let that = this;
 				util.request(api.DeviceList, {}, 'post', 'application/json').then(function(res) {
 					if (res.code === 0) {
@@ -194,6 +196,12 @@
 						//that.page = res.data.currentPage + 1
 						that.totalPages2 = res.pages
 						that.deviceList = that.deviceList.concat(res.data.records)
+					    if(equId){
+					    	that.deviceId = equId;
+					    	that.index2 = that.deviceList.findIndex(function(item){
+					    		return item.id === equId;
+					    	});
+					    }
 					}
 				});
 			},
@@ -203,6 +211,8 @@
 					that.range=[util.getNowDate(0), util.getNowDate(1)];
 					that.isToday = true					
 				}else{
+					//异常状态位
+					//that.queryParams.model
 					that.isToday = false
 				}
 				if (that.deviceId) {
@@ -259,18 +269,10 @@
 			}
 			this.getOrderList(type)
 		},
-		onLoad: function(option) {		
-			this.getDeviceList();
-			console.log(this.deviceList)
+		onLoad: function(option) {	
 			let type = option.type? option.type : ""
 			let equId = option.equId? option.equId : ""
-			if(equId){
-				this.deviceId = equId;
-				this.index2 = this.deviceList.findIndex(function(item){
-					return item.id === equId;
-				});
-				console.log(this.index2);
-			}
+			this.getDeviceList(equId);
 			this.getOrderList(type);
 		}
 	}