lilei 3 lat temu
rodzic
commit
92f4901fcb
3 zmienionych plików z 21 dodań i 9 usunięć
  1. 2 2
      App.vue
  2. 9 0
      api/bundel.js
  3. 10 7
      pages/report/report.vue

+ 2 - 2
App.vue

@@ -1,8 +1,8 @@
 <script>
 	export default {
 		globalData: {
-			// baseUrl: 'http://192.168.16.156:7904/beauty-customer/', // 本地
-			baseUrl: 'https://cust.test.baibaibai.net/beauty-customer/', // 预发布
+			baseUrl: 'http://192.168.16.156:7904/beauty-customer/', // 本地
+			// baseUrl: 'https://cust.test.baibaibai.net/beauty-customer/', // 预发布
 			// baseUrl: 'https://cust.baibaibai.net/beauty-customer/' // 生产
 		},
 		onLaunch: function() {

+ 9 - 0
api/bundel.js

@@ -25,4 +25,13 @@ export const getCustomerUseHistory = params => {
     method: 'post',
     data: params
   })
+}
+
+// 诊断报告
+export const checkBillQueryList = params => {
+  return request({
+    url: `checkBill/queryPage/${params.pageNo}/${params.pageSize}`,
+    method: 'post',
+    data: params
+  })
 }

+ 10 - 7
pages/report/report.vue

@@ -9,13 +9,17 @@
 						 <view class="flex align_center justify_between item-box" v-for="item in list" :key="item.id" @click="toDetail(item)">
 						 	<view class="l_box flex align_center">
 								<view class="l_imgs">
-									<u-image height="7em" border-radius="0.4em"></u-image>
+									<u-image :src="checkResult.imgPath+'mid/img_sun.jpg'" height="7em" border-radius="0.4em"></u-image>
 								</view>
 								<view class="flex_1" style="padding: 0 0.6em;">
-									<view style="line-height: 1.5em;">{{item.bundleName}}</view>
+									<view style="line-height: 1.5em;">
+										<view v-if="item.blackDetectTypeName">{{item.blackDetectTypeName}}</view>
+										<view v-if="item.redDetectTypeNam">{{item.redDetectTypeName}}</view>
+										<view v-if="item.yellowDetectTypeName">{{item.yellowDetectTypeName}}</view>
+									</view>
 									<view class="l_time flex align_center justify_between ">
 										<view>{{item.store.name}}</view>
-										<view>{{item.createDate.split(' ')[0]}}</view>
+										<view>{{item.checkDate}}</view>
 									</view>
 								</view>
 							</view>
@@ -49,7 +53,7 @@
 	import uniPopup from '@/components/uni-popup/uni-popup.vue'
 	import uniPopupDialog from '@/components/uni-popup/uni-popup-dialog.vue'
 	import { listLookUp, getLookUpDatas } from '@/api/data.js';
-	import { getCustomerBundle } from '@/api/bundel.js'
+	import { checkBillQueryList } from '@/api/bundel.js'
 	import userBar from '../index/userBar.vue'
 	export default {
 		components: {
@@ -143,8 +147,7 @@
 			    pageSize: this.pageSize,
 			  }
 			  this.status = "loading"
-			  getCustomerBundle(params).then(res => {
-				console.log(params,res,'+++++++++++')
+			  checkBillQueryList(params).then(res => {
 				if (res.status == 200) {
 				  if(this.pageNo>1){
 					  this.list = this.list.concat(res.data.list || [])
@@ -180,7 +183,7 @@
 			},
 			toDetail(item){
 				uni.navigateTo({
-					url:"/pages/h5Page/index?src=https://md.test.baibaibai.net/checkReport/index/mini/316546464645"
+					url:"/pages/h5Page/index?src=https://md.test.baibaibai.net/checkReport/index/mini/"+item.id
 				})
 			}
 		}