xiaohaizhao 1 年間 前
コミット
1553fdc825

+ 1 - 0
pages/index/collect/index.js

@@ -87,6 +87,7 @@ Component({
 				"id": 20221128183202,
 				"content": {
 					istool: 0,
+					type: "标准订单",
 					"tradefield": data.type, //必选
 					"items": data.list.map(v => {
 						return {

+ 12 - 1
pages/index/home/index.js

@@ -1,9 +1,20 @@
 Component({
-	properties: {},
+	properties: {
+		cutBar: Function
+	},
 	options: {
 		addGlobalClass: true,
 	},
 	data: {
 		appid: "wxc1b6ae925ac1d06a"
 	},
+	methods: {
+		openRecord(e) {
+			const {
+				it,
+				item
+			} = e.currentTarget.dataset;
+			if (it.PageCur) this.triggerEvent("cutBar", it.PageCur)
+		}
+	}
 })

+ 1 - 1
pages/index/home/index.wxml

@@ -9,7 +9,7 @@
 			<view class="group" wx:if="{{item.list.length}}">
 				<view class="label"><text class="work {{item.icon}}" />{{item.label}}</view>
 				<view class="main">
-					<navigator version='trial' class="item" wx:for="{{item.list}}" wx:for-item="it" wx:for-index="i" target='{{item.appid!=appid?"miniProgram":"self"}}' app-id='{{item.appid}}' path="{{it.path+'?auth='+auth+'&userMsg='+userMsg+'&site='+site}}" url="{{it.path}}" open-type="{{it.openType||'navigate'}}" wx:key="name" data-it="{{it}}" data-item="{{item}}" bindtap="openRecord">
+					<navigator version='trial' class="item" wx:for="{{item.list}}" wx:for-item="it" wx:for-index="i" target='{{item.appid!=appid?"miniProgram":"self"}}' app-id='{{item.appid}}' path="{{it.path+'?auth='+auth+'&userMsg='+userMsg+'&site='+site}}" url="{{it.PageCur ? '#' :it.path}}" open-type="{{it.openType||'navigate'}}" wx:key="name" data-it="{{it}}" data-item="{{item}}" bindtap="openRecord">
 						<view class="icon-box" style="background-color: {{it.bColor}};">
 							<text class="work {{it.icon}}" style="color: {{it.color}};" />
 						</view>

+ 44 - 10
pages/index/index.js

@@ -1,11 +1,19 @@
-const pageInit = {};
+const pageInit = {},
+	_Http = getApp().globalData.http;
+
 
 Page({
 	data: {
 		PageCur: 'Home',
+		collectCount: "", //购物车商品数量
 	},
-	onLoad() {
+	onLoad(options) {
+		if (options.PageCur) this.setData({
+			PageCur: options.PageCur
+		})
 		this.refreshData();
+		this.getCollectCount();
+		getApp().globalData.getCollectCount = this.getCollectCount.bind(this);
 	},
 	/**
 	 * 更新站点信息
@@ -25,7 +33,7 @@ Page({
 			function getedd() {
 				let paths = [{
 					name: "商城",
-					path: "/packageA/market/index",
+					PageCur: "Market",
 					icon: "work-shangcheng"
 				}, {
 					name: "销售订单",
@@ -41,7 +49,7 @@ Page({
 					icon: "work-cuxiaohuodong"
 				}, {
 					name: "购物车",
-					path: "/packageA/shopping/index",
+					PageCur: "Collect",
 					icon: "work-gouwuche"
 				}, {
 					name: "打款凭证",
@@ -142,18 +150,44 @@ Page({
 			return;
 		}
 	},
+	/**
+	 * 更新购物车数量
+	 */
+	getCollectCount() {
+		return _Http.basic({
+			"id": 20220927093202,
+			"content": {}
+		}).then(res => {
+			console.log("购物车数量", res)
+			getApp().globalData.collectCount = res.data.num;
+			pageInit.Collect = false;
+			this.setData({
+				collectCount: res.data.num
+			})
+			return res.data.num;
+		});
+	},
 	/** 
 	 * 切换页面
 	 */
 	NavChange(e) {
-		let PageCur = e.currentTarget.dataset.cur;
-		if (!pageInit[PageCur]) {
-			let page = this.selectComponent("#" + PageCur);
+		this.cutBar({
+			detail: e.currentTarget.dataset.cur
+		})
+	},
+	/** 
+	 * 切换bar
+	 */
+	cutBar({
+		detail
+	}) {
+		if (!pageInit[detail]) {
+			let page = this.selectComponent("#" + detail);
 			page && page.init();
-			pageInit[PageCur] = true;
+			pageInit[detail] = true;
 		}
 		this.setData({
-			PageCur
+			PageCur: detail
 		})
-	},
+	}
 })

+ 6 - 2
pages/index/index.json

@@ -1,6 +1,10 @@
 {
 	"usingComponents": {
+		"cu-custom": "/colorui/components/cu-custom",
 		"Home": "./home/index",
-		"UserCenter": "./userCenter"
-	}
+		"Collect": "./collect/index",
+		"UserCenter": "./userCenter",
+		"Market": "./market/index"
+	},
+	"navigationStyle": "custom"
 }

+ 13 - 7
pages/index/index.wxml

@@ -1,14 +1,20 @@
+<cu-custom isBack="{{false}}">
+	<view slot="content">E-订单</view>
+</cu-custom>
 <view hidden="{{PageCur!='Home'}}">
-	<Home id='Home' />
+	<Home id='Home' bind:cutBar="cutBar" />
+</view>
+<view hidden="{{PageCur!='Market'}}">
+	<Market id='Market' />
+</view>
+<view hidden="{{PageCur!='Collect'}}">
+	<Collect id='Collect' />
 </view>
 <view hidden="{{PageCur!='UserCenter'}}">
 	<UserCenter id='UserCenter' />
 </view>
 
-
-
 <view class="cu-bar tabbar bg-white foot">
-
 	<view class="action {{PageCur=='Home'?'text-blue':'text-gray'}}" bindtap="NavChange" data-cur="Home">
 		<view class="cuIcon-homefill"></view>
 		首页
@@ -18,14 +24,14 @@
 		<view class="cuIcon-similar"></view> 分类
 	</view>
 
-	<view class="action {{PageCur=='Home'?'text-blue':'text-gray'}} add-action">
+	<view class="action {{PageCur=='Market'?'text-blue':'text-gray'}} add-action" bindtap="NavChange" data-cur="Market">
 		<button class="cu-btn cuIcon-shopfill bg-blue shadow"></button>
 		商城
 	</view>
 
-	<view class="action  {{PageCur=='Home'?'text-blue':'text-gray'}}">
+	<view class="action  {{PageCur=='Collect'?'text-blue':'text-gray'}}" bindtap="NavChange" data-cur="Collect">
 		<view class=" cuIcon-cart">
-			<view class="cu-tag badge">99</view>
+			<view class="cu-tag badge">{{collectCount}}</view>
 		</view>
 		购物车
 	</view>

+ 2 - 5
pages/login/modules/login.js

@@ -71,11 +71,8 @@ function query_adspacelist() {
 
 function toHome() {
     if (count < 3) return;
-    let pages = getCurrentPages();
-    let prevPage = pages[pages.length - 2];
-    if (prevPage && prevPage.__route__ == 'pages/tabbar/home/index') prevPage.refreshData();
-    wx.switchTab({
-        url: '/pages/tabbar/home/index'
+    wx.reLaunch({
+        url: '/pages/index/index'
     })
 }
 /* 站点数据查询 */