Merge branch 'master' into dev

# Conflicts:
#	pages/subPack/oldhistoryDetail.vue
#	pages/user/user.vue
#	utils/common.js
#	utils/request.js

ext.json

@@ -6,6 +6,7 @@
 		"shopId": "E37BB296-5A08-4534-859D-B351BA611AF9",
 		"url":"http://api.dms.66km.com.cn",
 		"unionId":"EEADACCD-8A19-499D-8AD7-6975D2C93243",
-		"appId":"wx33053a645546ec31"
+		"appId":"wx33053a645546ec31",
+		"themeColor":"0"
 	}
 }

pages.json

@@ -29,8 +29,8 @@
 			"path": "pages/user/user",
 			"style": {
 				"navigationBarTitleText": "我的",
-				"navigationBarBackgroundColor": "#D53533",
-				"navigationBarTextStyle": "white",
+				/* "navigationBarBackgroundColor": "#D53533",
+				"navigationBarTextStyle": "white", */
 				"enablePullDownRefresh": true
 			}
 		}, {
@@ -582,31 +582,31 @@
 	
 		"tabBar": {
 			"color": "#8a8a8a",
-			"selectedColor": "#D53533",
+			"selectedColor": "#8a8a8a",
 			"borderStyle": "black",
 			"backgroundColor": "#ffffff",
 			"list": [{
 					"pagePath": "pages/index/index",
 					"iconPath": "./static/tabimg/index2.png",
-					"selectedIconPath": "./static/tabimg/index1.png",
+					"selectedIconPath": "./static/tabimg/index2.png",
 					"text": "首页"
 				},
 				{
 					"pagePath": "pages/shop/shop",
 					"iconPath": "./static/tabimg/shop2.png",
-					"selectedIconPath": "./static/tabimg/shop1.png",
+					"selectedIconPath": "./static/tabimg/shop2.png",
 					"text": "商城"
 				},
 				{
 					"pagePath": "pages/activity/activity",
 					"iconPath": "./static/tabimg/activty2.png",
-					"selectedIconPath": "./static/tabimg/activity1.png",
+					"selectedIconPath": "./static/tabimg/activty2.png",
 					"text": "活动"
 				},
 				{
 					"pagePath": "pages/user/user",
 					"iconPath": "./static/tabimg/me2.png",
-					"selectedIconPath": "./static/tabimg/me1.png",
+					"selectedIconPath": "./static/tabimg/me2.png",
 					"text": "我的"
 				}
 

pages/index/index.vue

@@ -297,6 +297,7 @@
 			 //this.$common.getExtStoreId()
 			 var ext=this.$common.getExtStoreId();
 			 this.ext=ext
+			 console.log("ext--themeColor")
 			 console.log(ext)
 			//console.log( String(Date.now()))
 			this.shopId=ext.shopId;
@@ -1148,7 +1149,7 @@
 		margin-left: 24rpx;
 	}
 	.indexTop{
-		background: #D53533;
+		/* background: #D53533; */
 		width: 750rpx;
 		position: fixed;
 		top: 0;
@@ -1228,12 +1229,12 @@
 	.topBox{
 		width: 750rpx;
 		height: 150rpx;
-		background: #D53533;
+		/* background: #D53533; */
 	}
 	.yuanhu{
 		width: 750rpx;
 		height: 50rpx;
-		background: #D53533;
+		/* background: #D53533; */
 		border-radius: 0 0 100% 100%;
 	}
 	.carinfoBox{

pages/subPack/chooseCity.vue

@@ -244,7 +244,7 @@
 		right: 30rpx;
 		top: 200rpx;
 		height: 80vh;
-		    overflow-y: scroll;
+		overflow-y: scroll;
 	}
 	.content {
 		
@@ -280,7 +280,7 @@
 		/* height: calc(100vh - 80rpx); */
 		height: 100vh;
 		box-sizing: border-box;
-		padding: 20rpx 24rpx 20rpx;
+	
 
 	}
 
@@ -327,6 +327,7 @@
 	.listContent {
 		display: flex;
 		justify-content: space-between;
+			padding: 20rpx 24rpx 20rpx;
 	}
 
 	.city-list {

pages/subPack/oldhistoryDetail.vue

@@ -278,6 +278,10 @@
 						if (item.fieldValue == 'ReceiptsMoney') {
 							this.ReceiptsMoney = item.isChecked
 						}
+						if (item.fieldValue == 'TotalDiscountMoney') {
+							this.TotalDiscountMoney = item.isChecked
+						}
+
 
 
 

pages/user/historyDetail.vue

@@ -338,7 +338,9 @@
 						if (item.fieldValue == 'ReceiptsMoney') {
 							this.ReceiptsMoney = item.isChecked
 						}
-
+                        if (item.fieldValue == 'TotalDiscountMoney') {
+                        	this.TotalDiscountMoney = item.isChecked
+                        }
 
 
 					})

pages/user/user.vue

@@ -240,7 +240,9 @@
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
-		    <view class="rowBox" @click="gonavigateTo('../subPack/depositList')">
+
+		   <!-- <view class="rowBox" @click="gonavigateTo('../subPack/depositList')">
+
 				<view class="leftView">
 					<image src="../../static/timg/icon_jydd.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">我的寄存</view>
@@ -1006,7 +1008,7 @@ padding-right: 10rpx;
 	.top {
 		height: 350rpx;
 		padding: 20rpx 24rpx 0;
-		background-color: #D53533;
+		/* background-color: #D53533; */
 		border-radius: 0 0 5% 5%;
 	}
 

utils/common.js

@@ -80,18 +80,13 @@ function noMultipleClicks(methods, info) {
 function getExtStoreId(type){
 	try{
 	 var extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {shopId:'默认的门店id'};
+
 		  /* extConfig={
-		  	"shopId": "23173848-292E-4AEA-B590-73AC9A763F1D",
-		  	"url":"https://store-api.qdbtl.cn/",
-		  	"unionId":"C3748B46-B778-40AA-8C60-A9B0F2FA23A7",
-		  	"appId":"wxc023ff04deb28f2d"
-	      } */
-		  /* 
 		  "shopId": "E37BB296-5A08-4534-859D-B351BA611AF9",
-		  "url":"http://api.dms.66km.com.cn",
-		  "unionId":"EEADACCD-8A19-499D-8AD7-6975D2C93243",
-		  "appId":"wx33053a645546ec31"
-		  */
+		  "url":"https://apidms.66km.com",
+		  "unionId":"EF7981B9-2D1D-4006-9C0A-66CE7177134D",
+		  "appId":"wx2c6f04c0dcd15984"
+		  } */
 		console.log(extConfig,'extJson对象');
 		//return extConfig[type];
 		return extConfig

utils/request.js

@@ -9,9 +9,11 @@ import $store from '../store'
 const extConfig = uni.getExtConfigSync();		
 console.log(extConfig)
 const baseUrl=extConfig.url+'/'
-//const baseUrl='http://192.168.0.147:20187/'
+
+//const baseUrl='http://192.168.0.131:20189/'
 //const baseUrl='https://store-api.qdbtl.cn/'
-//const baseUrl='http://dms.66km.com.cn/'
+//const baseUrl='https://apidms.66km.com/'
+
 //wxc023ff04deb28f2d正式  wx33053a645546ec31 E37BB296-5A08-4534-859D-B351BA611AF9 EEADACCD-8A19-499D-8AD7-6975D2C93243 
 //测试地址
 //const webUrl = 'http://dms.32che.cn/'
@@ -53,7 +55,7 @@ const http = (url = '', date = {}, type = 'POST', header = {
 				//  	 icon:'none',
 				//      duration: 3000,
 				//  });
-				 uni.clearStorageSync()
+				// uni.clearStorageSync()
 				//  uni.navigateTo({
 				// 	url:'../login/login'
 				// })