修改bug

common/setting.js

@@ -9,7 +9,7 @@ module.exports = {
 	// 版本号
 	version: '1.0.0',
 	// 开发环境接口Url
-	// devUrl: 'http://192.168.8.106:1080',
+	// devUrl: 'http://192.168.8.104:1080',
 	devUrl: 'http://121.37.83.47:10004',
 	// devUrl:'http://192.168.8.107:8099',
 	// 线上环境接口Url

http/api.js

@@ -65,7 +65,7 @@ http.interceptors.response.use((response) => {
 			success: function(res) {
 				if (res.confirm) {
 					uni.reLaunch({
-						url: '/pages/login/login-account'
+						url: '/pages/login/login'
 					});
 				}
 			}
@@ -95,4 +95,4 @@ http.interceptors.response.use((response) => {
 	}
 	return Promise.reject(response.data)
 })
-export default http;
+export default http;

manifest.json

@@ -2,9 +2,10 @@
     "name" : "途宝即时配",
     "appid" : "__UNI__218FCF0",
     "description" : "",
-    "versionName" : "1.0.97",
-    "versionCode" : 97,
+    "versionName" : "1.1.02",
+    "versionCode" : 102,
     "transformPx" : false,
+    "sassImplementationName" : "node-sass",
     /* 5+App特有相关 */
     "app-plus" : {
         "safearea" : {
@@ -59,7 +60,8 @@
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
+                ],
+                "minSdkVersion" : 21
             },
             /* ios打包配置 */
             "ios" : {

pages/views/customer/index.vue

@@ -52,7 +52,7 @@
 					</view>
 					<view class="textBox">
 						<view>商城价格:{{item.priceSystem}}</view>
-						<div style="color: #fd4b09;" v-show="item.filePath"  @click="choice(item,index)">
+						<div style="color: #fd4b09;" v-show="item.filePath" @click="choice(item,index)">
 							二维码
 						</div>
 						<div v-show="!item.filePath" @click="choice(item,index)">
@@ -63,7 +63,7 @@
 				</view>
 			</view>
 		</view>
-		
+
 		<u-popup :show="showImg" mode="center" @close="closeImg">
 			<view style="width: 400px;height: 400px;">
 				<u-image style="margin-top: 50rpx;" width="100%" height="600rpx" :src="filePathImg"
@@ -87,8 +87,8 @@
 	export default {
 		data() {
 			return {
-				filePathImg:null,
-				showImg:false,
+				filePathImg: null,
+				showImg: false,
 				dataList: [],
 				columns: [],
 				sortOpen: false,
@@ -139,7 +139,7 @@
 		methods: {
 			closeImg() {
 				this.showImg = false
-				this.filePathImg=null
+				this.filePathImg = null
 			},
 			dropdownOpen() {
 				this.sortOpen = false
@@ -198,7 +198,8 @@
 				});
 				queryList({
 					...this.form,
-					corpType: 'KH'
+					corpType: 'KH',
+					enableOrNot: 1,
 				}).then(res => {
 					if (res.data.records) {
 						this.dataList = this.dataList.concat(res.data.records)

pages/views/customerAnalysis/details.vue

@@ -195,7 +195,7 @@
 		max-width: 500rpx;
 	}
 
-	.cellClass /deep/ .u-cell {
+	.cellClass :v-deep .u-cell {
 		&__body {
 			padding: 2px 10px;
 		}

pages/views/customerAnalysis/index.vue

@@ -22,18 +22,18 @@
 					<u-icon name="list" size="21" bold></u-icon>
 				</view>
 			</u-tabs> -->
-			<view class="tabFilter">
+			<!-- <view class="tabFilter">
 					<u-tag v-if='form.days' :text="form.days+'天'" plain size="mini" style="margin-left: 10px;"></u-tag>
 					<u-tag v-if='form.notPurchased==1' text="未购买" plain size="mini" style="margin-left: 10px;"></u-tag>
 					<u-tag v-if='form.sort==1' text="业务员" plain size="mini" style="margin-left: 10px;"></u-tag>
 					<u-tag v-if='form.sort==2' text="客户" plain size="mini" style="margin-left: 10px;"></u-tag>
 					<u-tag v-if='form.sort==3' text="地址" plain size="mini" style="margin-left: 10px;"></u-tag>
 					<u-tag v-if='form.sort==4' text="日期" plain size="mini" style="margin-left: 10px;"></u-tag>
-			</view>
+			</view> -->
 
 
 		</view>
-		<view class="content" style="margin-top:126px">
+		<view class="content" style="margin-top:90px">
 			<view class="contentBox" v-for="(item,index) in dataList" :key="index">
 				<view style="width: 100%;margin: 0 auto;" @click="inPage(item)">
 					<u-cell-group :border="false">
@@ -105,7 +105,7 @@
 			return {
 				defaultValue: {
 					"days": ["30"],
-					"notPurchased": ["1"],
+					"notPurchased": [],
 					"sort": ["1"]
 				},
 				list: [{
@@ -182,7 +182,8 @@
 					size: 10,
 					sort: 1,
 					days: 30,
-					notPurchased: 1
+					endDays: 59,
+					notPurchased:null
 				},
 				tabsList: [{
 					dictKey: 1,
@@ -220,17 +221,33 @@
 		methods: {
 			shfilterChange(val) {
 				console.log(val)
-				if (val.days) {
-					this.form.days = val.days[0]
+				if (val.days&&val.days.length) {
+					if (val.days[0] == 30) {
+						this.form.days = val.days[0]
+						this.form.endDays = 59
+					}
+					if (val.days[0] == 60) {
+						this.form.days = val.days[0]
+						this.form.endDays = 119
+					}
+					if (val.days[0] == 120) {
+						this.form.days = val.days[0]
+						this.form.endDays = 364
+					}
+					if (val.days[0] == 365) {
+						this.form.days = val.days[0]
+						this.form.endDays = null
+					}
 				} else {
 					this.form.days = 30
+					this.form.endDays = 59
 				}
-				if (val.notPurchased) {
+				if (val.notPurchased&&val.notPurchased.length) {
 					this.form.notPurchased = 1
 				} else {
 					this.form.notPurchased = null
 				}
-				if (val.sort) {
+				if (val.sort&&val.sort.length) {
 					this.form.sort = val.sort[0]
 				} else {
 					this.form.sort = 1
@@ -310,7 +327,6 @@
 		margin: 20rpx auto;
 		background-color: #FFFFFF;
 		border-radius: 20rpx;
-		/* box-shadow: 0 5rpx 14rpx 0 rgba(101, 176, 249, 0.42); */
 		padding-top: 15rpx;
 		padding-bottom: 10rpx;
 	}

pages/views/salesSlip/index.vue

@@ -882,6 +882,11 @@
 					type: 'warning',
 					message: '请选择客户！'
 				})
+				if (!this.form.salerName) return this.$refs.uNotify.show({
+					top: this.revenueTop,
+					type: 'warning',
+					message: '请选择业务员！'
+				})
 				if (!this.form.businesDate) return this.$refs.uNotify.show({
 					top: this.revenueTop,
 					type: 'warning',

uni_modules/map-Point/components/map-Point/map-Point.vue

@@ -880,7 +880,7 @@
 					height: 100%;
 					display: flex;
 
-					/deep/ .u-icon {
+					:v-deep .u-icon {
 						.u-icon__icon {
 							font-size: 45rpx !important;
 							font-weight: bold !important;

uni_modules/sh-filter/components/sh-filter/sh-filter.vue

@@ -348,7 +348,7 @@
 			defaultValue: {
 				type: Object,
 				default: () => {}
-			}
+			},
 		},
 		data() {
 			return {
@@ -569,7 +569,7 @@
 			}, 100),
 			// 关闭筛选弹窗
 			closeSelectPopup(isClickBtn = false) {
-				this.$emit('setData',this.params)
+				this.$emit('setData', this.params)
 				return new Promise((resolve) => {
 					this.animatePopup = 'fadeOut'
 					setTimeout(() => {
@@ -645,7 +645,7 @@
 			}, max = 0) {
 				if (!value) return
 				let _value = this.params[field] || []
-				if (this.options.min==1) {
+				if (this.options.min == 1) {
 					if (_value[0] == value) {
 						return
 					}
@@ -708,8 +708,11 @@
 			},
 			// 重置筛选条件
 			resetField() {
-				this.params = this.defaultValue
-				this.closeSelectPopup()
+				this.params = this.deepClone(this.defaultValue)
+				setTimeout(() => {
+					this.closeSelectPopup()
+				}, 200);
+
 			},
 			getMatchSwitchLabel(option) {
 				const {
@@ -1001,7 +1004,7 @@
 			width: 100%;
 			padding: 0 30rpx;
 			box-sizing: border-box;
-			// box-shadow: 0 0 4px 2px rgba($color: #000000, $alpha: 0.06);
+			box-shadow: 0 0 1px 1px rgba($color: #000000, $alpha: 0.06);
 			position: relative;
 		}
 

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://app.liuyingyong.cn/build/download/c2a80230-f3d9-11ef-82b0-b5e264c4b7f8
+https://app.liuyingyong.cn/build/download/4b45dae0-3477-11f0-9dba-713a55c8ee96

unpackage/cache/certdata

@@ -1,3 +1,4 @@
 andrCertfile=D:/My Object/parts_shop_ui_LT/static/certificate/distribution/yichepei.keystore
 andrCertAlias=testalias
 andrCertPass=QBh9cdJZpjpUawbESpp5EQ==
+storePassword=QBh9cdJZpjpUawbESpp5EQ==