liujun 2 anni fa
parent
commit
40a3fbe6c8

+ 24 - 22
.hbuilderx/launch.json

@@ -1,24 +1,26 @@
-{ // launch.json 配置了启动调试时相关设置,configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
-  // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
-    "version": "0.0",
-    "configurations": [{
-     	"app-plus" : 
-     	{
-     		"launchtype" : "remote"
-     	},
-     	"default" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"h5" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"mp-weixin" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"type" : "uniCloud"
-     }
+{
+    // launch.json 配置了启动调试时相关设置,configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+    // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
+    "version" : "0.0",
+    "configurations" : [
+        {
+            "app-plus" : {
+                "launchtype" : "remote"
+            },
+            "default" : {
+                "launchtype" : "local"
+            },
+            "h5" : {
+                "launchtype" : "local"
+            },
+            "mp-weixin" : {
+                "launchtype" : "local"
+            },
+            "type" : "uniCloud"
+        },
+        {
+            "playground" : "custom",
+            "type" : "uni-app:app-android"
+        }
     ]
 }

+ 1 - 1
App.vue

@@ -7,7 +7,7 @@
 			token: '',
 			changeOrg:'',
 			version: '', // 当前版本号
-			buildType: 'dev', // 打包环境对应类型,pro 生产 uat 预发布 dev 本地开发
+			buildType: 'uat', // 打包环境对应类型,pro 生产 uat 预发布 dev 本地开发
 			envTips: '', // 环境文字提示
 			theme: 'default', // 主题,default
 			isIphoneXup: false //是否iphonex以及以上的版本

+ 6 - 4
components/customPicker/checkBoxPicker.vue

@@ -44,7 +44,8 @@ export default {
 			isShow: this.showModal,
 			chooseObj: null,
 			chooseFlag: -1,
-			list: []
+			list: [],
+			valInfo:this.val
 		};
 	},
 	methods: {
@@ -64,11 +65,11 @@ export default {
 						})
 						result.data.list.splice()
 					}
-					if (this.val) {//勾选上次选中值
-						var valArr = this.val.split(',');
+					if (this.valInfo) {//勾选上次选中值
+						var valArr = this.valInfo.split(',');
 						result.data.list.forEach(value => {
 						valArr.includes(value.code) ? value.checked=true:value.checked=false
-						});
+						});	
 					}
 					this.list = result.data.list;
 				}
@@ -110,6 +111,7 @@ export default {
 			if (!newValue) {
 				this.$emit('close');
 			} else {
+				this.valInfo= this.val
 				this.getList();
 			}
 		}

+ 1 - 0
components/customPicker/redioPicker.vue

@@ -94,6 +94,7 @@ export default {
 		isShow(newValue, oldValue) {
 			if (!newValue) {
 				this.$emit('close');
+				this.$parent.getData();
 			} else {
 				this.getList();
 			}

+ 14 - 2
hybrid/html/index.html

@@ -244,11 +244,14 @@
 		new Vue({
 			el: '#app',
 			data: {
-				ajaxUrl: 'http://192.168.0.215:8503/qpls-md/',
+				ajaxUrl: 'http://p.iscm.360arrow.com/qpls-md/',
 				saleList: [],
 				saleDetailList: [],
 				info: {},
-				time: ''
+				time: '',
+				startTime:'',
+				endTime:'',
+				customerSn:''
 			},
 			created() {
 				this.loadData();
@@ -269,6 +272,9 @@
 						if (res.data.data.bizBeginDate && res.data.data.bizEndDate) {
 							this.time = res.data.data.bizBeginDate.split(' ')[0] + '至' + res.data.data
 								.bizEndDate.split(' ')[0]
+								this.customerSn = res.data.buyerSn;
+								this.startTime = res.data.data.bizBeginDate;
+								this.endTime = res.data.data.bizEndDate
 						}
 					}).catch((error) => {
 						console.log(error);
@@ -293,6 +299,12 @@
 						bizEndDate: this.endTime,
 						dealerSn: this.getUrlParam(userSn)
 					}
+					// let ajaxData={
+					// 	targetSn: '478718467182370816',
+					// 	bizBeginDate: '2022-12-01 00:00:00',
+					// 	bizEndDate: '2022-12-21 59:59:59',
+					// 	dealerSn: '435465609255526400'
+					// }
 					axios.get(this.ajaxUrl + 'verify/exportExcel', {
 						params: ajaxData
 					}, {

+ 1 - 1
manifest.json

@@ -138,7 +138,7 @@
                     "xxxhdpi" : "unpackage/res/icons/192x192.png"
                 },
                 "ios" : {
-                    "appstore" : "证书/安卓/deskicon1.png",
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
                     "ipad" : {
                         "app" : "unpackage/res/icons/76x76.png",
                         "app@2x" : "unpackage/res/icons/152x152.png",

+ 20 - 9
pages/sales/bill.vue

@@ -105,7 +105,7 @@
 			<view class="slot-content"><rich-text :nodes="tipContent"></rich-text></view>
 		</u-modal>
 		<!-- 分享询问弹窗 -->
-		<u-modal v-model="shareShow" :show-cancel-button="true" :content="shareContent" @confirm="handleShare" @cancel="shareShow = false"></u-modal>
+		<u-modal v-model="shareShow" :show-cancel-button="true" :content="shareContent" @confirm="handleShare" @cancel="shareShow = false;submitLoading = false;"></u-modal>
 	</view>
 </template>
 
@@ -195,7 +195,8 @@ export default {
 			shareShow: false,
 			verifySn:'',
 			backDiscountPrice:null,
-			backDiscountVal:null
+			backDiscountVal:null,
+			cycleNameShow:''
 		};
 	},
 	onReady() {
@@ -281,6 +282,8 @@ export default {
 		},
 		handleClean() {
 			this.showSearch = false;
+			// 清空选择周期时组件值
+			this.$refs.rangeDate.init();
 			let systemList = this.$store.state.vuex_systemSetList;
 			let cycleObj = systemList.find(item => {
 				return item.remarks == 'sales_bill_period';
@@ -299,12 +302,12 @@ export default {
 				this.params.bizBeginDate = this.getQueryDate().beginDate;
 				this.params.bizEndDate = this.getQueryDate().endDate;
 				this.cycleName = this.changeShowTime();
-				this.dateArray = '';
 			} else if (this.curTab == 7) {
 				this.cycleName = this.placeTab[this.curTab].name;
 				this.params.bizBeginDate = undefined;
 				this.params.bizEndDate = undefined;
 			}
+			this.dateArray = '';
 			this.getList();
 		},
 		getList() {
@@ -332,7 +335,7 @@ export default {
 			this.dateArray = date.startDate + ' ~ ' + date.endDate;
 			this.params.bizBeginDate = date.startDate + ' 00:00:00';
 			this.params.bizEndDate = date.endDate + ' 23:59:59';
-			this.cycleName = date.startDate + '至' + date.endDate;
+			this.cycleNameShow = date.startDate + '至' + date.endDate;
 		},
 		// 更改日期格式显示
 		changeShowTime() {
@@ -358,6 +361,11 @@ export default {
 		},
 		handleSearch() {
 			this.showSearch = false;
+			if(this.curTab == 6){
+				this.cycleName = this.cycleNameShow;
+			}else{
+				this.cycleNameShow = ''
+			}
 			this.changeTime();
 		},
 		jumpPage(url) {
@@ -419,9 +427,12 @@ export default {
 					this.chooseList.push(row);
 				}
 			}
-			this.discountVal = ''
-			this.backDiscountPrice = this.settlement
-			this.backDiscountVal = this.discountVal
+			if(this.settlement *1 <0){
+				this.backDiscountVal = '0.00'
+			}else{
+				this.backDiscountVal = this.discountVal
+			}
+			 this.backDiscountPrice = this.settlement
 			// 是否全选
 			this.allChecked = isAllChecked;
 		},
@@ -465,8 +476,8 @@ export default {
 			let obj = {
 				detailNum: this.chooseList.length,
 				totalAmount: this.chooseTotalPayPrice,
-				discountAmount: this.discountVal || 0,
-				settleAmount: this.settlement,
+				discountAmount: this.backDiscountVal || 0,
+				settleAmount: this.chooseTotalPayPrice - this.backDiscountVal ,
 				detailList: this.chooseList
 			};
 			let ajaxData = Object.assign(this.params, obj);

+ 1 - 1
pages/sales/billHistory.vue

@@ -47,7 +47,7 @@
 		onLoad() {
 			uni.$on('chooseShelfOk',(data)=>{
 				this.pageNo=1;
-				this.targetSn = data.customerSn
+				this.targetSn = data.customerSn ?data.customerSn :undefined
 				this.curCustomerName=data.customerName
 				this.getList();
 			})

+ 2 - 1
pages/sales/billHistoryDetail.vue

@@ -45,7 +45,7 @@
 			<u-button type="primary" :loading="btnLoading" @click="submitOrder" :custom-style="customStyle" shape="circle">再次发送对账单</u-button>
 		</view>
 		<!-- 分享询问弹窗 -->
-		<u-modal v-model="shareShow" :content="shareContent" @confirm="handleShare" @cancel="shareShow = false"></u-modal>
+		<u-modal v-model="shareShow" :show-cancel-button="true" :content="shareContent" @confirm="handleShare" @cancel="shareShow = false;btnLoading = false;"></u-modal>
 	</view>
 </template>
 
@@ -68,6 +68,7 @@ export default {
 			timeInfo: '',
 			btnLoading: false,
 			shareShow: false,
+			shareContent: `是否同意发送对账单给微信好友?`,
 			toThousands
 		};
 	},

+ 4 - 6
pages/sales/customerList.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="sales-list-component">
-		<scroll-view class="sales-list-con" :style="{ height: scrollH + 'px' }" scroll-y @scrolltolower="onreachBottom">
+		<scroll-view class="sales-list-con" :scrollTop="scrollTop" :style="{ height: scrollH + 'px' }" scroll-y @scrolltolower="onreachBottom">
 			<view class="customer-list" v-for="(item, i) in listData" :key="i" @click="getDetail(item)">
 				<view class="u-line-1">{{ item.customer.customerName }}</view>
 				<view class="customer-b u-flex">
@@ -48,7 +48,8 @@ export default {
 			outModal: false, // 出库弹框
 			delModal: false, // 删除/取消弹框
 			delText: '确认要删除吗?',
-			scrollH: 300
+			scrollH: 300,
+			scrollTop:0
 		};
 	},
 	watch: {
@@ -77,10 +78,7 @@ export default {
 			if (pageNo) {
 				this.pageNo = pageNo;
 			}
-			uni.pageScrollTo({
-				scrollTop:0,
-				duration:300
-			})
+			this.scrollTop = 0;
 			let params = Object.assign(this.params, { pageNo: this.pageNo, pageSize: this.pageSize });
 			this.status = 'loading';
 			queryCustomerPage(params).then(res => {

+ 6 - 3
pages/sales/salesDetail.vue

@@ -82,16 +82,19 @@
 				<scroll-view class="sales-list-con" :style="{height:scrollH+'upx'}" scroll-y>
 					<view class="sales-list-item flex align_center justify_between" v-for="(con,i) in payRecode" :key="">
 						<view class="sales-list-l">
-							<view>{{con.createDate}}</view>
-							<view>{{con.payType}}</view>
+							<view>{{con.settleTime}}</view>
+							<view v-if="con.settleStyleSnDictValue">{{con.settleStyleSnDictValue}}</view>
 						</view>
 						<view class="sales-list-r income" >
-							{{con.price *1 > 0?'+':'-'}}¥{{con.price}}
+							{{con.settleAmount *1 > 0?'+':'-'}}¥{{con.settleAmount}}
 						</view>
 					</view>
 					<view v-if="payRecode.length==0">
 						<u-empty :src="`/static/${$config('themePath')}/def_no_data@3x.png`" icon-size="150" :text="noDataText" mode="list" :margin-top="50"></u-empty>
 					</view>
+					<view style="padding: 20upx;">
+						<u-loadmore  status="nomore" />
+					</view>
 				</scroll-view>
 			</view>
 			</view>

+ 2 - 1
pages/userCenter/setData.vue

@@ -80,7 +80,7 @@ export default {
 			activeColor: this.$config('primaryColor')
 		};
 	},
-	onShow() {
+	onLoad() {
 		this.getData();
 	},
 	methods: {
@@ -144,6 +144,7 @@ export default {
 						title: res.message,
 						icon: 'success'
 					});
+					this.getData();
 				} else {
 					uni.showToast({
 						title: res.message,

+ 1 - 1
uni.scss

@@ -18,7 +18,7 @@
 /* 行为相关颜色 */
 $uni-color-primary: #007aff;
 $uni-color-success: #4cd964;
-$uni-color-warning: #ffa500;
+$uni-color-warning: #f0ad4e;
 $uni-color-error: #dd524d;
 
 /* 文字基本颜色 */