更新

Reviewed-on: #11

packageIntegral/productList/index.vue

@@ -24,7 +24,7 @@
 				<view class="introduce">
 					<image :src="item.url"></image>
 					<view>{{item.productName}}</view>
-					<view>规格：默认</view>
+					<view>规格：{{ item.attributesTypeName }}</view>
 					<view>库存：{{item.totalStock}}</view>
 				</view>
 				<view class="examine" @click="examineDetail(item)"
@@ -215,7 +215,7 @@
 			productByPage() {
 				serve.productByPage(this.paramter).then(res => {
 					if (res.code === 20000) {
-						if (!res.data.list.length&&this.paramter.currentPage!=1) {
+						if (!res.data.list.length && this.paramter.currentPage != 1) {
 							uni.showToast({
 								title: '没有更多订单啦~',
 								icon: 'none'
@@ -245,8 +245,10 @@
 				this.$refs.delete.open('center')
 				this.deleteData = item
 			},
-			deleteIntegral(){
+			deleteIntegral() {
-				serve.deleteProductById({id:this.deleteData.id}).then(res=>{
+				serve.deleteProductById({
+					id: this.deleteData.id
+				}).then(res => {
 					uni.showToast({
 						title: res.msg,
 						icon: 'none'

packageOrders/pages/orderList/orderList.vue

@@ -4,6 +4,7 @@
 			<block slot="backText">返回</block>
 			<block slot="content">加油记录</block>
 		</cu-custom>
+
 		<view class="fixed-t">
 			<view class="flex bg-main-oil padding solid-bottom">
 				<!-- <view class="flex-sub">
@@ -24,7 +25,11 @@
 						v-for="(item,index) in tabList" :key="index" @tap="tabSelect" :data-id="index">{{item}}</view>
 				</view>
 			</scroll-view>
+			<view v-if="exportShow" style="margin-top: 16rpx;text-align: right;padding-right: 30rpx;">
+				<button class="cu-btn bg-white" style="border: 1px solid #ddd;" @click="orderExport">订单导出</button>
 			</view>
+		</view>
+		<view v-if="exportShow" style="padding: 24rpx;"></view>
 		<!-- 	<view class="placeholder-hidden">
 			<view class="flex bg-main-oil padding solid-bottom">
 				<view class="flex-sub">
@@ -46,12 +51,12 @@
 				</view>
 			</scroll-view>
 		</view> -->
-		<view v-if="exportShow==true">
+		<!-- 	<view v-if="exportShow">
-			<view style="padding: 30upx;"></view>
+			<view style="padding: 30rpx;"></view>
-		<view style="position: fixed;width: 750upx;z-index: 5;text-align: right;top:315upx;right: 30upx;">
+			<view style="position: fixed;width: 750rpx;z-index: 5;text-align: right;top:315rpx;right: 30rpx;">
-			<button  class="cu-btn bg-white" @click="orderExport">订单导出</button>
+				<button class="cu-btn bg-white" style="border: 1px solid #ddd;" @click="orderExport">订单导出</button>
-		</view>
 			</view>
+		</view> -->
 
 		<view class="padding　 padding-bottom-0" style="padding-top: 200upx;">
 			<!-- 0 全部  1 待支付  2 已支付 3退款 -->
@@ -109,19 +114,22 @@
 						<input v-model="params.email" class="card_item_input" placeholder="请输入邮箱" />
 					</view>
 					<view class="popup_card_from_item">
-						<view class="popup_card_from_item_left_text">开始时间：</view>
+						<view class="popup_card_from_item_left_text" style="margin-top: 32rpx;">开始时间：</view>
 						<view class="uni-list-cell-db">
-							<picker mode="date" :value="startDate" @change="startDateChange" class="uni-picker">
+							<uni-datetime-picker type="datetime" :value="startDate" @change="startDateChange" />
+							<!-- <picker mode="date" :value="startDate" @change="startDateChange" class="uni-picker">
 								<view class="uni-input">{{startDate}}</view>
-							</picker>
+							</picker> -->
 						</view>
 					</view>
 					<view class="popup_card_from_item">
-						<view class="popup_card_from_item_left_text">结束时间：</view>
+						<view class="popup_card_from_item_left_text" style="margin-top: 32rpx;">结束时间：</view>
 						<view class="uni-list-cell-db">
-							<picker mode="date" :value="endDate" @change="endDateChange" :start="endStartDate" :end="endEndDate" class="uni-picker">
+							<uni-datetime-picker type="datetime" :value="endDate" @change="endDateChange"
+								:start="endStartDate" :end="endEndDate" />
+							<!-- 	<picker mode="date" :value="endDate" @change="endDateChange" :start="endStartDate" :end="endEndDate" class="uni-picker">
 								<view class="uni-input">{{endDate}}</view>
-							</picker>
+							</picker> -->
 						</view>
 					</view>
 				</view>
@@ -150,13 +158,13 @@
 		data() {
 			return {
 
-				startTime:'',
+				startTime: '',
-				endTime:"",
+				endTime: "",
 				activeSource: '小程序',
 				indexSource: 1,
 				sources: ['网页版', '小程序'],
 				tabList: [
-					'全部','待支付', '已支付 ', '退款'
+					'全部', '待支付', '已支付 ', '退款'
 				],
 				TabCur: 0,
 				pageNumber: 1,
@@ -197,15 +205,15 @@
 				params: {
 					siteId: uni.getStorageSync('oilSitePriceId'),
 					siteName: uni.getStorageSync('oilSitePriceName'),
-					email:'',
+					email: '',
-					startTime:'',
+					startTime: '',
-					endTime:''
+					endTime: ''
 				},
-				startDate:'',
+				startDate: '',
-				endDate:'',
+				endDate: '',
-				endStartDate:'',
+				endStartDate: '',
-				endEndDate:'',
+				endEndDate: '',
-				exportShow:false
+				exportShow: false
 
 			}
 		},
@@ -222,14 +230,21 @@
 				'1689183144276463616',
 				'1689183774927818752',
 				'1689184331812888576',
-				'1689185023261741056'
+				'1689185023261741056',
+				'1782596400854310912',
+				'1661994395596533760',
+				'1825776105145946112',
+				'1802612281797746688',
+				'1508364963431362560',
+				'1844642035400552448',
+				'1938594475885268992'
 			]
 			var exportFields = exportList.filter((item) => {
 				return item == uni.getStorageSync('oilSitePriceId');
 			})
-				if(exportFields.length>0){
+			if (exportFields.length > 0) {
 				this.exportShow = true
-				}else{
+			} else {
 				this.exportShow = false
 			}
 
@@ -242,16 +257,16 @@
 			this.loadMoreOrder('onReachBottom')
 		},
 		methods: {
-			getTime(){
+			getTime() {
 				let nowDate = new Date();
 				let year = nowDate.getFullYear();
 				let month = nowDate.getMonth() + 1 < 10 ? "0" + (nowDate.getMonth() + 1) : nowDate.getMonth() + 1;
 				let day = nowDate.getDate() < 10 ? "0" + nowDate.getDate() : nowDate.getDate();
 				let hr = nowDate.getHours()
 				let mf = nowDate.getMinutes() < 10 ? '0' + nowDate.getMinutes() : nowDate.getMinutes()
-				  let ss =nowDate.getSeconds() < 10 ? '0' + nowDate.getSeconds() :nowDate.getSeconds()
+				let ss = nowDate.getSeconds() < 10 ? '0' + nowDate.getSeconds() : nowDate.getSeconds()
-				 this.startTime = year + "-" + month + "-" + day+" " + '00:00:00';
+				this.startTime = year + "-" + month + "-" + day + " " + '00:00:00';
-				 this.endTime = year + "-" + month + "-" + day+" " +hr+':'+mf+':'+ss
+				this.endTime = year + "-" + month + "-" + day + " " + hr + ':' + mf + ':' + ss
 			},
 			loadMoreOrder(from) {
 				// console.log(from,'loadMoreOrder时间')
@@ -284,7 +299,7 @@
 				this.loadMoreOrder('tabSelect')
 			},
 			pickSource(e) {
-				this.indexSource = parseInt( e.detail.value)
+				this.indexSource = parseInt(e.detail.value)
 				this.activeSource = this.sources[this.indexSource]
 				uni.setStorageSync('orderType', this.indexSource)
 				this.pageNumber1 = 0
@@ -329,7 +344,7 @@
 				let that = this
 				const data2 = {
 					istate: istate, //类型：Number  必有字段  备注：订单状态 0待支付 1支付成功   查所有传 ''
- 					pageIndex: pageNumber ,//类型：Number  必有字段  备注：查询第几页,默认一页10条
+					pageIndex: pageNumber, //类型：Number  必有字段  备注：查询第几页,默认一页10条
 					// startTime: that.startTime,
 					// endTime: that.endTime
 				}
@@ -450,33 +465,33 @@
 					})
 				}
 			},
-			startDateChange:function(e){
+			startDateChange: function(e) {
-				this.startDate = e.detail.value
+				this.startDate = e
-				let data=this.startDate
+				let data = this.startDate
 				this.endStartDate = data
-				this.endEndDate = this.getEndDate(Date.parse(data)+ 3600 * 1000 * 24 * 30)
+				this.endEndDate = this.getEndDate(Date.parse(data) + 3600 * 1000 * 24 * 31)
 				this.params.startTime = this.startDate
 			},
-			endDateChange:function(e){
+			endDateChange: function(e) {
-				if(this.startDate ==''){
+				if (this.startDate == '') {
 					uni.showToast({
 						title: '请先选择开始时间',
 						icon: 'none'
 					});
-				}else{
+				} else {
-					this.endDate = e.detail.value
+					this.endDate = e
 					this.params.endTime = this.endDate
 				}
 
 			},
-			getEndDate(val){
+			getEndDate(val) {
 				let nowDate = new Date(val)
 				let year = nowDate.getFullYear();
 				let month = nowDate.getMonth() + 1 < 10 ? "0" + (nowDate.getMonth() + 1) : nowDate.getMonth() + 1;
 				let day = nowDate.getDate() < 10 ? "0" + nowDate.getDate() : nowDate.getDate();
 				return year + "-" + month + "-" + day
 			},
-			orderExport(){
+			orderExport() {
 				this.startDate = ''
 				this.endDate = ''
 				this.params.email = ''
@@ -502,14 +517,14 @@
 						return false
 					}
 				}
-				if(this.params.startTime==''){
+				if (this.params.startTime == '') {
 					uni.showToast({
 						title: '请选择开始时间',
 						icon: 'none'
 					});
 					return false
 				}
-				if(this.params.endTime==''){
+				if (this.params.endTime == '') {
 					uni.showToast({
 						title: '请选择结束时间',
 						icon: 'none'
@@ -517,8 +532,8 @@
 					return false
 				}
 				uni.showModal({
-					content: '请确认邮箱 \n'+this.params.email,
+					content: '请确认邮箱 \n' + this.params.email,
-					success:  (res)=> {
+					success: (res) => {
 						if (res.confirm) {
 							oliFinanceApi.getOrderInfoExport(this.params).then(res => {
 								if (res.code == 20000) {
@@ -556,13 +571,16 @@
 		width: 750upx;
 		z-index: 3;
 	}
-	.uni-input{
+
+	.uni-input {
 		height: 25rpx;
 	}
-	.uni-picker{
+
+	.uni-picker {
 		height: 25rpx;
 	}
-	.uni-list-cell-db{
+
+	.uni-list-cell-db {
 		width: 100%;
 		height: 30rpx;
 	}

pages/login/boforeLogin/boforeLogin.vue

@@ -23,9 +23,10 @@
 
 		</view>
 		<view class="margin text-center">
-			<button v-if="checked" class="cu-btn round  bg-main-oil  lg text-lg" open-type="getPhoneNumber"
-				@getphonenumber="decryptPhoneNumber">
 			<!-- <text class="cuIcon-weixin padding-right-xs"> </text> -->
+	<!-- 		<button v-if="checked" class="cu-btn round  bg-main-oil  lg text-lg" open-type="getPhoneNumber"
+				@getphonenumber="decryptPhoneNumber">
+				
 				<text>
 					手机号快捷登录
 				</text>
@@ -34,7 +35,7 @@
 				<text>
 					手机号快捷登录
 				</text>
-			</button>
+			</button> -->
 			<!-- <button class="cu-btn round  btnSize" open-type="getPhoneNumber"
 				@getphonenumber="decryptPhoneNumber">
 				<text class="cuIcon-weixin  text-green lg"></text>

pages/login/posLogin/posLogin.vue

@@ -10,7 +10,7 @@
 				<text class>油站工作人员绑定油站</text>
 			</view>
 		</view> -->
-		<view class="banner text-lg">
+		<view v-if="!isPad" class="banner text-lg">
 			欢迎使用星油云站
 		</view>
 		<view class="pannel">
@@ -140,6 +140,7 @@
 	export default {
 		data() {
 			return {
+				isPad:false,
 				titleText: "",
 				errMsg: '',
 				checkUser: false,
@@ -162,6 +163,12 @@
 		},
 		created() {
 			uni.showShareMenu()
+			uni.getSystemInfo({
+				success:(res) => {
+					// console.log('getSystemInfoSync',res)
+					this.isPad = res.deviceType === 'pad'
+				}
+			})
 		},
 		methods: {
 			checkAgree(val) {

utils/request.js

@@ -2,16 +2,14 @@ import axios from 'axios'
 import utils from '@/utils/encode'
 
  // const env = 'test' /* */
- // const env = 'test'//   仅用于测试、
  const env = 'production'
 //42 洛超  /29 孙志华 /40 阿浩
 // 测试日日顺时需要连阿浩
 
-const testUrl = 'http://192.168.0.26:38080'
+const testUrl = 'http://192.168.110.77:38080'
 // const productionUrl = 'https://www.51xingka.net/oilApp' // 生产，加密 old
-// const productionUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new 
+const productionUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new 
-// const productionUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new 
+// const productionUrl = 'http://uat.xingoil.com/adminapi'
-const productionUrl = 'http://uat.xingoil.com/adminapi'
 // const env = process.env.NODE_ENV  // 环境
 const service = axios.create({
  	baseURL: env=='production'?productionUrl:testUrl, //  
@@ -49,7 +47,7 @@ service.interceptors.request.use(
 		if (env === 'production') {
 			// 生产环境，加密，不输出任何东西
 			// 设置jsessionid和token
-			console.log('这里是生产')
+			// console.log('这里是生产')
 			const JSESSIONID = utils.uuid()
 			config.headers['JSESSIONID'] = JSESSIONID
 			config.headers['token'] = utils.md5Salt(JSESSIONID)
@@ -100,13 +98,13 @@ service.interceptors.response.use(
 				// console.log('生产环境 请求路径', response.config.url, '解密为', res.data)
 			}
 		} else {
-			console.log('请求路径', response.config.url, '返回结果未加密', res)
+			// console.log('请求路径', response.config.url, '返回结果未加密', res)
-			console.log('-------------------------------------------')
+			// console.log('-------------------------------------------')
 		}
 
 		uni.hideLoading()
 		if (res.code != 20000) {
-			console.log('这里是登录报错处',res)
+			// console.log('这里是登录报错处',res)
 			if(response.config.url.indexOf('/oil-user/oilCustomerChannelRelation/getByPhone/') != -1){
 				// uni.hideToast()
 			}else{
@@ -125,23 +123,11 @@ service.interceptors.response.use(
 						success: function(res) {
 							if (res.confirm) {
 								uni.reLaunch({
-									url: '/pages/login/boforeLogin/boforeLogin',
+									url: '/pages/login/boforeLogin/boforeLogin'
-									success: () => {
-										console.log('跳转成功')
-									},
-									fail: (err) => {
-										console.log(err)
-									}
 								})
 							} else if (res.cancel) {
 								uni.reLaunch({
-									url: '/pages/login/boforeLogin/boforeLogin?type=1',
+									url: '/pages/login/boforeLogin/boforeLogin?type=1'
-									success: () => {
-										console.log('跳转成功')
-									},
-									fail: (err) => {
-										console.log(err)
-									}
 								})
 							}
 						}
@@ -154,13 +140,7 @@ service.interceptors.response.use(
 					icon: "none"
 				})
 				uni.reLaunch({
-					url: '/pages/login/boforeLogin/boforeLogin',
+					url: '/pages/login/boforeLogin/boforeLogin'
-					success: () => {
-						console.log('跳转成功')
-					},
-					fail: (err) => {
-						console.log(err)
-					}
 				})
 			}
 			if(res.code == 42077){
@@ -169,13 +149,7 @@ service.interceptors.response.use(
 					icon: "none"
 				})
 				uni.reLaunch({
-					url: '/pages/login/boforeLogin/boforeLogin',
+					url: '/pages/login/boforeLogin/boforeLogin'
-					success: () => {
-						console.log('跳转成功')
-					},
-					fail: (err) => {
-						console.log(err)
-					}
 				})
 			}
 			
@@ -201,7 +175,6 @@ service.interceptors.response.use(
 		uni.hideLoading()
 		uni.getNetworkType({
 			success: function(res) {
-				console.log(res.networkType);
 				if (res.networkType === 'none') {
 					uni.showToast({
 						title: '没有网啦！',