Merge branch 'master' of http://git.ringzle.com:3000/htcwl/hotelHomestayWx

components/uNavBar/index.vue

@@ -70,9 +70,18 @@
 					}
 					let canNavBack = getCurrentPages();
 					if (canNavBack && canNavBack.length > 1) uni.navigateBack();
-					else uni.reLaunch({
-						url: '/pages/home/index'
-					})
+					else{
+						if(uni.getStorageSync('homestayId')==''){
+							uni.reLaunch({
+								url: '/pagesHouse/home/index'
+							})
+						}else{
+							uni.reLaunch({
+								url: '/pages/home/index'
+							})
+						}
+						
+					}
 				} else {
 					if (this.tabUrls.find(u => u == url)) uni.reLaunch({
 						url
@@ -84,9 +93,15 @@
 				this.$emit('goBack',url)
 			},
 			toHome() {
-				uni.reLaunch({
-					url: '/pages/home/index'
-				})
+				if(uni.getStorageSync('homestayId')==''){
+					uni.reLaunch({
+						url: '/pagesHouse/home/index'
+					})
+				}else{
+					uni.reLaunch({
+						url: '/pages/home/index'
+					})
+				}
 			}
 		}
 	}

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "hotelHomestay",
-    "appid" : "__UNI__3A1C8AF",
+    "appid" : "__UNI__131ABEA",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

pages.json

@@ -1,6 +1,13 @@
 {
 	"pages": [
 		//首页
+		{
+			"path": "pages/login/select",
+			"style": {
+				"navigationBarTitleText": "选择门店",
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/home/index",
 			"style": {
@@ -38,13 +45,7 @@
 				"navigationStyle": "custom"
 			}
 		},
-		{
-			"path": "pages/login/select",
-			"style": {
-				"navigationBarTitleText": "选择门店",
-				"navigationStyle": "custom"
-			}
-		},
+		
 		//房态
 		{
 			"path": "pages/house/index",

pages/login/index.vue

@@ -3,7 +3,7 @@
 		<view class="box">
 			<image src="https://i.ringzle.com/file/20240109/d6c4691423cf40c2bdf9210d389cdd1e.png"></image>
 			<view class="text">您好！欢迎使用<br>游嵊泗商家服务平台</view>
-			<view class="" @click="aa()">商户静态页面入口</view>
+			<!-- <view class="" @click="aa()">商户静态页面入口</view> -->
 			<view class="login">
 				<button open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">登录</button>
 			</view>

pages/login/select.vue

@@ -61,8 +61,9 @@
 				} else {
 					uni.setStorageSync('homestayId', '');
 					uni.setStorageSync('merchantId', item.merchantId);
+					uni.setStorageSync('merchantName', item.merchantName);
 					uni.reLaunch({
-						url: '/pagesHouse/home/index?merchantName='+item.merchantName 
+						url: '/pagesHouse/home/index'
 					})
 				}
 				

pagesHouse/Mine/PersonalEditing/PersonalEditing.vue

@@ -91,10 +91,18 @@
 			}
 		},
 		onLoad() {
-
+			this.getInfo();
 		},
 
 		methods: {
+			getInfo(){
+				this.$api.get('/merchant/merchantFisherman/home/').then(res=>{
+					console.log(res)
+					if(res.data.code==0){
+						this.dto=res.data.data;
+					}
+				})
+			},
 			// 上传头像
 			upImage() {
 				uni.chooseImage({

pagesHouse/home/index.vue

@@ -99,7 +99,7 @@
 	export default {
 		data() {
 			return {
-				merchantName: '黄沙村渔家乐',
+				merchantName:uni.getStorageSync('merchantName'),
 				emg: 'https://i.ringzle.com/file/20240224/91173dde1cb44b139129e12ad4971f1d.png',
 				icons: ['https://i.ringzle.com/file/20240224/70ab9f9d1a144c95927dedc6e84bcce7.png',
 					'https://i.ringzle.com/file/20240224/3f990c250f444ac9a5d9f334f322c98e.png',
@@ -110,9 +110,9 @@
 			}
 		},
 		onLoad(opt){
-			if(opt.merchantName ){
-				this.merchantName =opt.merchantName ;
-			}
+			// if(opt.merchantName ){
+			// 	this.merchantName =opt.merchantName ;
+			// }
 			this.getData();
 			this.getList();
 		},

pagesHouse/home/tj.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="page" :style="{'min-height':(h-th)+'px','padding-top':mt+'px'}">
+	<view class="page tt" :style="{'min-height':(h-th)+'px','padding-top':mt+'px'}">
 		<c-nav-bar title="数据统计"></c-nav-bar>
 		<view class="tabs">
 			<text :class="type==1?'on':''" @click="type=1">月账单</text>
@@ -32,9 +32,10 @@
 				<view class="t2">总退款<text>{{total2}}</text></view>
 			</view>
 			<view class="line_charts_two">
-				<qiun-data-charts type="line" :opts="gameOpts" :chartData="gameChartData" />
+				<qiun-data-charts type="line" :opts="gameOpts" :chartData="gameChartData" :ontouch="true" />
 			</view>
 		</view>
+		
 		<u-datetime-picker @confirm="confirmDate" @cancel="show=false" :show="show" v-model="value1"
 			mode="year-month"></u-datetime-picker>
 	</view>
@@ -62,51 +63,31 @@
 				gameOpts: {
 					color: ["#4B98FE", "#00D05E"],
 					padding: [15, 15, 0, 15],
-					dataLabel: false,
-					dataPointShapeType: 'hollow',
-					dataZoom: [{
-							type: 'slider',
-							start: 0,
-							end: 50,
-						},
-						{
-							type: 'inside',
-							orient: 'vertical',
-						},
-					],
-					grid: {
-						left: '3%',
-						right: '4%',
-						bottom: '10%',
-						height: '80%',
-						containLabel: true,
-					},
+					enableScroll: true,
 
+					legend: {
+						show: false
+					},
 					xAxis: {
 						disableGrid: true,
+						gridType: "solid",
+						itemCount: 6,
+						scrollColor: "#f44",
+						scrollShow: true,
+						axisLineColor: "#EFEFEF",
 					},
 					yAxis: {
-						gridColor: "rgba(230,230,230,0.6)",
-						disabled: false,
-						disableGrid: false,
-						gridType: 'dash',
-						dashLength: '4',
-						data: [{
-							axisLineColor: "#FFFFFF",
-						}, ],
+						gridType: "solid",
+						gridColor: "#EFEFEF",
+						dashLength: 2
 					},
-					// legend: {
-					// 	show: true,
-					// 	position: "top",
-					// 	float: "left",
-					// },
 					extra: {
 						line: {
 							type: "curve",
 							width: 2,
 							activeType: "hollow"
-						},
-					},
+						}
+					}
 				},
 			}
 		},
@@ -130,6 +111,7 @@
 		onLoad() {
 			this.gettopData();
 			this.getBottomData();
+			//this.drawGameCharts(['1','2'], [11,2], [12.11]);
 		},
 		methods: {
 			confirmDate(e) {
@@ -204,13 +186,11 @@
 					series: [{
 							name: "总收入",
 							data: y,
-							legendShape: "circle",
 							color: "#367BFF",
 						},
 						{
 							name: "总退款",
 							data: z,
-							legendShape: "circle",
 							color: "#77DFDD",
 						},
 					],
@@ -221,7 +201,13 @@
 	}
 </script>
 
-<style scoped lang="scss">
+<style scoped lang="less">
+	.tt {
+		/deep/.u-picker__view__column {
+			width: 100%;
+		}
+	}
+
 	.line_charts_two {
 		width: 630rpx;
 		height: 500rpx;