修改了我的页面的用户资产

pages.json

@@ -376,6 +376,30 @@
 						"title": "用户积分",
 						"group": "用户中心"
 					}
+				},
+				{
+					"path": "wallet/scoreToMoney",
+					"style": {
+						"navigationBarTitleText": "积分兑换"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "积分兑换",
+						"group": "用户中心"
+					}
+				},
+				{
+					"path": "wallet/team",
+					"style": {
+						"navigationBarTitleText": "团队"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "团队",
+						"group": "用户中心"
+					}
 				}
 				
 			]
@@ -492,6 +516,21 @@
 				}
 			}]
 		},
+		{
+			"root": "pages/shop",
+			"pages": [{
+				"path": "index",
+				"style": {
+					"navigationBarTitleText": "店铺首页"
+				},
+				"meta": {
+					"auth": true,
+					"sync": true,
+					"title": "店铺首页",
+					"group": "应用"
+				}
+			}]
+		},
 		{
 			"root": "pages/public",
 			"pages": [{

pages/app/sign.vue

@@ -92,24 +92,28 @@
 		</view>
 		<s-empty v-else-if="!state.data && !state.loading" icon="/static/data-empty.png" text="签到活动还未开始">
 		</s-empty>
-		<su-popup :show="state.showModel" type="center" round="10" :isMaskClick="false">
+		<su-popup :show="state.showModel" type="center" round="10" :isMaskClick="false" showClose>
 			<view class="model-box ss-flex-col">
 				<view class="ss-m-t-56 ss-flex-col ss-col-center">
 					<text class="cicon-check-round"></text>
-					<view class="score-title">{{ state.signin.score }}积分</view>
+					<!-- <view class="score-title">{{ state.signin.score }}积分</view> 
 					<view class="model-title ss-flex ss-col-center ss-m-t-22 ss-m-b-30">
 						已连续打卡{{ state.continue_days }}天
-					</view>
+					</view> -->
+					<view class="score-title">恭喜签到成功</view>
+					<view class="model-title ss-flex ss-col-center ss-m-t-22 ss-m-b-30">
+						获得每日签到10积分
+					</view> 
 				</view>
 				<view class="model-bg ss-flex-col ss-col-center ss-row-right">
-					<view class="title ss-m-b-64">签到成功</view>
+					<!-- <view class="title ss-m-b-64">签到成功</view> -->
 					<view class="ss-m-b-40">
-						<button class="ss-reset-button confirm-btn" @tap="onConfirm">确认</button>
+						<button class="ss-reset-button confirm-btn" >去领得更多福利</button>
 					</view>
 				</view>
 			</view>
 		</su-popup>
-		<su-popup :show="state.showRetroactive" type="center" round="10" :isMaskClick="false">
+		<!--<su-popup :show="state.showRetroactive" type="center" round="10" :isMaskClick="false">
 			<view class="model-box ss-flex-col">
 				<view class="ss-m-t-56 ss-flex-col ss-col-center">
 					<text class="cicon-check-round"></text>
@@ -118,15 +122,15 @@
 						已连续打卡{{ state.continue_days }}天
 					</view>
 				</view>
-				<!-- <view class="model-bg ss-flex-col ss-col-center ss-row-right">
+				 <view class="model-bg ss-flex-col ss-col-center ss-row-right">
 					<view class="title ss-m-b-64">确认补签</view>
 					<view class="ss-m-b-40 ss-flex">
 						<button class="ss-reset-button cancel-btn" @tap="state.showRetroactive = false">取消</button>
 						<button class="ss-reset-button confirm-btn" @tap="onRetroactive">确认</button>
 					</view>
-				</view> -->
+				</view> 
 			</view>
-		</su-popup>
+		</su-popup>-->
 	</s-layout>
 </template>
 
@@ -548,7 +552,7 @@
 			}
 
 			.confirm-btn {
-				width: 220rpx;
+				width: 300rpx;
 				height: 70rpx;
 				background: linear-gradient(90deg, #ff6000, #fe832a);
 				box-shadow: 0 0.2em 0.5em rgba(#ff6000, 0.4);

pages/goods/components/detail/detail-tabbar.vue

@@ -10,7 +10,7 @@
 					<view class="item-title">首页</view>
 				</view>
 				<view v-if="serviceIcon" class="detail-tabbar-item ss-flex ss-flex-col ss-row-center ss-col-center"
-					@tap="onChat">
+					@tap="onShopIndex">
 					<image class="item-icon" src="@/static/icon/shop.png"
 						mode="aspectFit" />
 					<view class="item-title">店铺</view>
@@ -23,7 +23,7 @@
 				</view> -->
 				
 				<view v-if="shareIcon" class="detail-tabbar-item ss-flex ss-flex-col ss-row-center ss-col-center"
-					@tap="showShareModal">
+					@tap="sheep.$router.go('/pages/index/cart');">
 					<image class="item-icon" src="@/static/icon/cart.png"
 						mode="aspectFit" />
 					<view class="item-title">购物车</view>
@@ -127,7 +127,11 @@
 			props.modelValue.favorite = true;
 		}
 	}
-
+	const onShopIndex = () => {
+		sheep.$router.go('/pages/shop/index', {
+			id: props.modelValue.id,
+		});
+	};
 	const onChat = () => {
 		sheep.$router.go('/pages/chat/index', {
 			id: props.modelValue.id,
@@ -135,7 +139,9 @@
 	};
 	const onIndex = () => {
 		sheep.$router.go('/pages/index/index');
-	}
+	}	
+	
+	
 </script>
 
 <style lang="scss" scoped>

pages/index/index.vue

@@ -1,4 +1,4 @@
-<!-- 首页，支持店铺装修 -->
+<!-- 商城首页，支持店铺装修 -->
 <template>
 	<view v-if="template">
 		<s-layout title="首页" navbar="custom" tabbar="/pages/index/index" :bgStyle="template.page"
@@ -25,6 +25,7 @@
 	uni.hideTabBar();
 
 	const template = computed(() => sheep.$store('app').template?.home);
+	console.log(template)
 	// 在此处拦截改变一下首页轮播图 此处先写死后期复活 放到启动函数里
 	// (async function() {
 		// console.log('原代码首页定制化数据',template)

pages/index/user.vue

@@ -8,6 +8,7 @@
     :navbarStyle="template.style?.navbar"
     onShareAppMessage
   >
+	
     <s-block v-for="(item, index) in template.components" :key="index" :styles="item.property.style">
       <s-block-item :type="item.id" :data="item.property" :styles="item.property.style" />
     </s-block>
@@ -23,6 +24,7 @@
   uni.hideTabBar();
 
   const template = computed(() => sheep.$store('app').template.user);
+  console.log(template.value)
   const isLogin = computed(() => sheep.$store('user').isLogin);
 
   onShow(() => {

pages/public/richtext.vue

@@ -1,15 +1,18 @@
 <!-- 文章展示 -->
 <template>
-  <s-layout class="set-wrap" :title="state.title" :bgStyle="{ color: '#FFF' }">
+  <s-layout class="set-wrap" :title="state.title" :bgStyle="{ color: '#FFF' }" v-if="state.title && !type">
     <view class="ss-p-30">
       <mp-html class="richtext" :content="state.content" />
     </view>
   </s-layout>
+  
+  <mp-html class="richtext" :content="state.content" v-else/>
+
 </template>
 
 <script setup>
   import { onLoad } from '@dcloudio/uni-app';
-  import { reactive } from 'vue';
+  import { reactive,defineProps } from 'vue';
   import ArticleApi from '@/sheep/api/promotion/article';
 
   const state = reactive({
@@ -31,15 +34,24 @@
       });
     }
   }
-
+const props = defineProps({
+	title:{
+		defautls:'',
+		type:String
+	},
+	type:{
+		defautls:'',
+		type:String
+	}
+})
   onLoad((options) => {
-    if (options.title) {
-      state.title = options.title;
+    if (options.title || props.title) {
+      state.title = options.title  || props.title;
       uni.setNavigationBarTitle({
-        title: state.title,
+        title: state.title  || props.title,
       });
     }
-    getRichTextContent(options.id, options.title);
+    getRichTextContent(options.id, options.title||props.title);
   });
 
 </script>

pages/shop/index.vue

@@ -0,0 +1,129 @@
+<!-- 店铺首页，支持店铺装修 -->
+<template>
+	<view v-if="template">
+		<s-layout title="xxx店" navbar="normal" tabbar="/pages/index/index" :bgStyle="template.page"
+			:navbarStyle="template.style?.navbar" onShareAppMessage >
+			<s-block v-for="(item, index) in template.components" :key="index" :styles="item.property.style">
+				<s-block-item :type="item.id" :data="item.property" :styles="item.property.style" />
+			</s-block>
+		</s-layout>
+	</view>
+</template>
+
+<script setup>
+	import {
+		computed
+	} from 'vue';
+	import {
+		onLoad,
+		onPageScroll,
+		onPullDownRefresh
+	} from '@dcloudio/uni-app';
+	import sheep from '@/sheep';
+	import $share from '@/sheep/platform/share';
+	// 隐藏原生tabBar
+	uni.hideTabBar();
+
+	const template = {
+	"page": {
+		"description": "",
+		"backgroundColor": "#f5f5f5",
+		"backgroundImage": ""
+	},
+	"navigationBar": {
+		"title": "页面标题",
+		"description": "",
+		"navBarHeight": 35,
+		"backgroundColor": "#fff",
+		"backgroundImage": "",
+		"styleType": "default",
+		"alwaysShow": true,
+		"showGoBack": true
+	},
+	"components": [{
+		"id": "SearchBar",
+		"property": {
+			"height": 28,
+			"showScan": false,
+			"borderRadius": 0,
+			"placeholder": "搜索商品",
+			"placeholderPosition": "left",
+			"backgroundColor": "rgb(238, 238, 238)",
+			"textColor": "rgb(150, 151, 153)",
+			"hotKeywords": [],
+			"style": {
+				"bgType": "color",
+				"bgColor": "#fff",
+				"marginBottom": 8,
+				"paddingTop": 8,
+				"paddingRight": 8,
+				"paddingBottom": 8,
+				"paddingLeft": 8
+			}
+		}
+	}, {
+		"id": "UserCard",
+		"property": {
+			"style": {
+				"bgType": "color",
+				"bgColor": "",
+				"marginBottom": 8
+			}
+		}
+	}]
+}
+
+	// 在此处拦截改变一下首页轮播图 此处先写死后期复活 放到启动函数里
+	// (async function() {
+		// console.log('原代码首页定制化数据',template)
+		// let {
+		// 	data
+		// } = await index2Api.decorate();
+		// console.log('首页导航配置化过高无法兼容',JSON.parse(data[1].value))
+		// 改变首页底部数据 但是没有通过数组id获取商品数据接口
+		// let {
+		// 	data: datas
+		// } = await index2Api.spids();
+		// template.value.data[9].data.goodsIds = datas.list.map(item => item.id);
+		// template.value.data[0].data.list = JSON.parse(data[0].value).map(item => {
+		// 	return {
+		// 		src: item.picUrl,
+		// 		url: item.url,
+		// 		title: item.name,
+		// 		type: "image"
+		// 	}
+		// })
+	// }())
+
+
+	onLoad((options) => {
+		// #ifdef MP
+		// 小程序识别二维码
+		if (options.scene) {
+			const sceneParams = decodeURIComponent(options.scene).split('=');
+			options[sceneParams[0]] = sceneParams[1];
+		}
+		// #endif
+
+		// 预览模板
+		if (options.templateId) {
+			sheep.$store('app').init(options.templateId);
+		}
+
+		// 解析分享信息
+		if (options.spm) {
+			$share.decryptSpm(options.spm);
+		}
+
+		// 进入指定页面(完整页面路径)
+		if (options.page) {
+			sheep.$router.go(decodeURIComponent(options.page));
+		}
+	});
+
+
+
+	onPageScroll(() => {});
+</script>
+
+<style></style>

pages/user/wallet/score.vue

@@ -1,277 +1,352 @@
 <!-- 我的积分 -->
 <template>
-  <s-layout class="wallet-wrap" title="我的积分" navbar="inner">
-    <view
-      class="header-box ss-flex ss-flex-col ss-row-center ss-col-center"
-      :style="[
-        {
-          marginTop: '-' + Number(statusBarHeight + 88) + 'rpx',
-          paddingTop: Number(statusBarHeight + 88) + 'rpx',
-        },
-      ]"
-    >
-      <view class="header-bg">
-        <view class="bg" />
-      </view>
-      <view class="score-box ss-flex-col ss-row-center ss-col-center">
-        <view class="ss-m-b-30">
-          <text class="all-title ss-m-r-8">当前积分</text>
-        </view>
-        <text class="all-num">{{ userInfo.point || 0 }}</text>
-      </view>
-    </view>
-    <!-- tab -->
-    <su-sticky :customNavHeight="sys_navBar">
-      <!-- 统计 -->
-      <view class="filter-box ss-p-x-30 ss-flex ss-col-center ss-row-between">
+	<s-layout class="wallet-wrap" :bgStyle="{'backgroundColor':'#ffffff'}" title="我的积分" navbar="normal">
+		<view class="score-box bg-white ss-flex-col ss-row-center ss-col-center">
+			<view class="ss-m-b-40 value-box " @tap="state.showModel = true">
+				<view class="all-title ss-m-r-8">#</view>
+			</view>
+			<view class="ss-m-b-40 ss-font-40">
+				<text class="all-title ss-m-r-8">#{{ userInfo.point || 0 }}</text>
+			</view>
+			<view class="ss-m-b-40 ss-font-32 text-center">
+				<view class="all-title ss-m-r-8 ss-m-b-10 ">当前可兑换积分:#3783</view>
+				<view class="all-title ss-m-r-8" style="color: var(--ui-BG-Main)" @tap="state.showQueModel = true">
+					待确权积分:#353</view>
+			</view>
+			<view class="ss-m-b-80">
+				<view class="all-title ss-m-r-8 ss-m-b-10">可兑换积分得计算规则</view>
+				<view class="all-title ss-m-r-8 text-center">[点击查看说明]</view>
+			</view>
+			<view class="ss-m-b-40">
+				<view class="all-title ss-m-r-8">
+					<button class="btn ss-reset-button ui-Shadow-Main" @tap="sheep.$router.go('/pages/user/wallet/scoreToMoney')">
+						兑换
+					</button>
+				</view>
+			</view>
+			<view class="ss-m-b-40">
+				<view class="all-title ss-m-r-8">
+					<button class="btn ss-reset-button ui-Shadow-Main">
+						代购NFR
+					</button>
+				</view>
+			</view>
+		</view>
+		<!-- tab 统计  -->
+		<!-- <su-sticky :customNavHeight="sys_navBar">
+			<view class="filter-box ss-p-x-30 ss-flex ss-col-center ss-row-between">
 				<uni-datetime-picker v-model="state.date" type="daterange" @change="onChangeTime" :end="state.today">
 					<button class="ss-reset-button date-btn">
 						<text>{{ dateFilterText }}</text>
 						<text class="cicon-drop-down ss-seldate-icon"></text>
 					</button>
 				</uni-datetime-picker>
-
-        <!-- TODO 芋艿：优化 -->
-<!--				<view class="total-box">-->
-<!--					<view class="ss-m-b-10">总收入￥{{ state.pagination.income }}</view>-->
-<!--					<view>总支出￥{{ -state.pagination.expense }}</view>-->
-<!--				</view>-->
 			</view>
-      <su-tabs
-        :list="tabMaps"
-        @change="onChange"
-        :scrollable="false"
-        :current="state.currentTab"
-      ></su-tabs>
-    </su-sticky>
-
-    <!-- list -->
-    <view class="list-box">
-      <view v-if="state.pagination.total > 0">
-        <view
-          class="list-item ss-flex ss-col-center ss-row-between"
-          v-for="item in state.pagination.list"
-          :key="item.id"
-        >
-          <view class="ss-flex-col">
-            <view class="name"
-              >{{ item.title }}{{ item.description ? ' - ' + item.description : '' }}</view
-            >
-            <view class="time">{{
-              sheep.$helper.timeFormat(item.createTime, 'yyyy-mm-dd hh:MM:ss')
-            }}</view>
-          </view>
-          <view class="add" v-if="item.point > 0">+{{ item.point }}</view>
-          <view class="minus" v-else>{{ item.point }}</view>
-        </view>
-      </view>
-      <s-empty v-else text="暂无数据" icon="/static/data-empty.png" />
-    </view>
-
-    <uni-load-more
-      v-if="state.pagination.total > 0"
-      :status="state.loadStatus"
-      :content-text="{
-        contentdown: '上拉加载更多',
-      }"
-      @tap="onLoadMore"
-    />
-  </s-layout>
+			<su-tabs :list="tabMaps" @change="onChange" :scrollable="false" :current="state.currentTab"></su-tabs>
+		</su-sticky> -->
+		<!-- 积分来源 -->
+		<su-popup :show="state.showModel" type="center" round="10" :isMaskClick="false" showClose @close="close">
+			<view class="model-box ss-flex-col">
+				<scroll-view class="list-box" scroll-y="true" @touchmove.stop>
+					<view v-if="state.pagination.total > 0">
+						<view class="list-item ss-flex ss-col-center"
+							v-for="item in state.pagination.list" :key="item.id">
+							<view class="name">{{ item.title }} : #{{ item.point}}</view>
+						</view>
+					</view>
+					<s-empty v-else text="暂无数据" icon="/static/data-empty.png" />
+				</scroll-view>
+			</view>
+		</su-popup>
+		
+		<!-- 积分确权 -->
+		<su-popup :show="state.showQueModel" type="center" round="10" :isMaskClick="false" showClose @close="close">
+			<view class="model-box ss-flex-col">
+				<view class="all-title ss-p-x-30 ss-p-t-30" >
+					待确权积分 <text style="float: right;">共#234</text>
+				</view>
+				<scroll-view class="list-box" style="width: 600rpx;" scroll-y="true" @touchmove.stop>
+					<view v-if="state.pagination.total > 0">
+						<view class="list-item ss-flex ss-col-center ss-row-between "
+							v-for="(item,index)  in state.pagination.list" :key="item.id" style="padding: 30rpx 0;">
+							<view class="ss-flex ss-col-center" style="width: 100%;">
+								<view>
+									{{index+1}}
+								</view>
+								<!-- 头像 -->
+								<view class="avatar-box ss-m-x-20">
+									<image class="avatar-img" :src="
+									    sheep.$url.static('/static/img/shop/default_avatar.png')" mode="aspectFill"></image>
+								</view>
+								<view class="ss-flex ss-m-t-10" style="flex-direction: column;align-items: flex-start;width: calc(100% - 5.5rem);">
+									<view class="name" style="width: 100%;"> {{ item.name || '空' }} <text style="float: right;">#{{item.point}}</text></view>
+									<view class="time " style="width: 100%;">{{sheep.$helper.timeFormat(item.createTime, 'yyyy-mm-dd hh:MM')}}
+										<text style="float: right;">消费额:￥234</text></view>
+								</view>
+							</view>
+						</view>
+					</view>
+
+					<s-empty v-else text="暂无数据" icon="/static/data-empty.png" />
+				</scroll-view>
+			</view>
+		</su-popup>
+	</s-layout>
+
 </template>
 
 <script setup>
-  import sheep from '@/sheep';
-  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
-  import { computed, reactive } from 'vue';
-  import _ from 'lodash';
-  import dayjs from 'dayjs';
-  import PointApi from '@/sheep/api/member/point';
-  import { resetPagination } from '@/sheep/util';
-
-  const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
-  const userInfo = computed(() => sheep.$store('user').userInfo);
-  const sys_navBar = sheep.$platform.navbar;
-
-  const state = reactive({
-    currentTab: 0,
-    pagination: {
-      list: 0,
-      total: 0,
-      pageSize: 6,
-      pageNo: 1,
-    },
-    loadStatus: '',
-    date: [],
-    today: '',
-  });
-
-  const tabMaps = [
-    {
-      name: '全部',
-      value: 'all',
-    },
-    {
-      name: '收入',
-      value: 'true',
-    },
-    {
-      name: '支出',
-      value: 'false',
-    },
-  ];
-
-  const dateFilterText = computed(() => {
-    if (state.date[0] === state.date[1]) {
-      return state.date[0];
-    } else {
-      return state.date.join('~');
-    }
-  });
-
-  async function getLogList() {
-    state.loadStatus = 'loading';
-    let { code, data } = await PointApi.getPointRecordPage({
-      pageNo: state.pagination.pageNo,
-      pageSize: state.pagination.pageSize,
-      addStatus: state.currentTab > 0 ? tabMaps[state.currentTab].value : undefined,
-      'createTime[0]': state.date[0] + ' 00:00:00',
-      'createTime[1]': state.date[1] + ' 23:59:59',
-    });
-    if (code !== 0) {
-      return;
-    }
-    state.pagination.list = _.concat(state.pagination.list, data.list);
-    state.pagination.total = data.total;
-    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
-  }
-
-  onLoad(() => {
-    state.today = dayjs().format('YYYY-MM-DD');
-    state.date = [state.today, state.today];
-    getLogList();
-  });
-
-  function onChange(e) {
-    state.currentTab = e.index;
-    resetPagination(state.pagination);
-    getLogList();
-  }
-
-  function onChangeTime(e) {
-    state.date[0] = e[0];
-    state.date[1] = e[e.length - 1];
-    resetPagination(state.pagination);
-    getLogList();
-  }
-
-  function onLoadMore() {
-    if (state.loadStatus === 'noMore') {
-      return;
-    }
-    state.pagination.pageNo++;
-    getLogList();
-  }
-
-  onReachBottom(() => {
-    onLoadMore();
-  });
+	import sheep from '@/sheep';
+	import {
+		onLoad,
+		onReachBottom
+	} from '@dcloudio/uni-app';
+	import {
+		computed,
+		reactive
+	} from 'vue';
+	import _ from 'lodash';
+	import dayjs from 'dayjs';
+	import PointApi from '@/sheep/api/member/point';
+	import {
+		resetPagination
+	} from '@/sheep/util';
+
+	const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+	const userInfo = computed(() => sheep.$store('user').userInfo);
+	const sys_navBar = sheep.$platform.navbar;
+
+	const state = reactive({
+		currentTab: 0,
+		pagination: {
+			list: 0,
+			total: 0,
+			pageSize: 6,
+			pageNo: 1,
+		},
+		loadStatus: '',
+		date: [],
+		today: '',
+		showModel: false,
+		showQueModel: false
+	});
+	const close = () => {
+		state.showModel = false
+		state.showQueModel = false
+	}
+	const tabMaps = [{
+			name: '全部',
+			value: 'all',
+		},
+		{
+			name: '收入',
+			value: 'true',
+		},
+		{
+			name: '支出',
+			value: 'false',
+		},
+	];
+
+	const dateFilterText = computed(() => {
+		if (state.date[0] === state.date[1]) {
+			return state.date[0];
+		} else {
+			return state.date.join('~');
+		}
+	});
+
+	async function getLogList() {
+		state.loadStatus = 'loading';
+		let {
+			code,
+			data
+		} = await PointApi.getPointRecordPage({
+			pageNo: state.pagination.pageNo,
+			pageSize: state.pagination.pageSize,
+			addStatus: state.currentTab > 0 ? tabMaps[state.currentTab].value : undefined,
+			'createTime[0]': state.date[0] + ' 00:00:00',
+			'createTime[1]': state.date[1] + ' 23:59:59',
+		});
+		if (code !== 0) {
+			return;
+		}
+		state.pagination.list = data.list;
+		state.pagination.total = data.total;
+		state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+	}
+
+	onLoad(() => {
+		state.today = dayjs().format('YYYY-MM-DD');
+		state.date = [state.today, state.today];
+		getLogList();
+	});
+
+	function onChange(e) {
+		state.currentTab = e.index;
+		resetPagination(state.pagination);
+		getLogList();
+	}
+
+	function onChangeTime(e) {
+		state.date[0] = e[0];
+		state.date[1] = e[e.length - 1];
+		resetPagination(state.pagination);
+		getLogList();
+	}
+
+	function onLoadMore() {
+		if (state.loadStatus === 'noMore') {
+			return;
+		}
+		state.pagination.pageNo++;
+		getLogList();
+	}
+
+	onReachBottom(() => {
+		onLoadMore();
+	});
 </script>
 
 <style lang="scss" scoped>
-  .header-box {
-    width: 100%;
-    background: linear-gradient(180deg, var(--ui-BG-Main) 0%, var(--ui-BG-Main-gradient) 100%)
-      no-repeat;
-    background-size: 750rpx 100%;
-    padding: 0 0 120rpx 0;
-    box-sizing: border-box;
-
-    .score-box {
-      height: 100%;
-
-      .all-num {
-        font-size: 50rpx;
-        font-weight: bold;
-        color: #fff;
-        font-family: OPPOSANS;
-      }
-
-      .all-title {
-        font-size: 26rpx;
-        font-weight: 500;
-        color: #fff;
-      }
-
-      .cicon-help-o {
-        color: #fff;
-        font-size: 28rpx;
-      }
-    }
-  }
-
-  // 筛选
-  .filter-box {
-    height: 114rpx;
-    background-color: $bg-page;
-
-    .total-box {
-      font-size: 24rpx;
-      font-weight: 500;
-      color: $dark-9;
-    }
-
-    .date-btn {
-      background-color: $white;
-      line-height: 54rpx;
-      border-radius: 27rpx;
-      padding: 0 20rpx;
-      font-size: 24rpx;
-      font-weight: 500;
-      color: $dark-6;
-
-      .ss-seldate-icon {
-        font-size: 50rpx;
-        color: $dark-9;
-      }
-    }
-  }
-
-  .list-box {
-    .list-item {
-      background: #fff;
-      border-bottom: 1rpx solid #dfdfdf;
-      padding: 30rpx;
-
-      .name {
-        font-size: 28rpx;
-
-        font-weight: 500;
-        color: rgba(102, 102, 102, 1);
-        line-height: 28rpx;
-        margin-bottom: 20rpx;
-      }
-
-      .time {
-        font-size: 24rpx;
-
-        font-weight: 500;
-        color: rgba(196, 196, 196, 1);
-        line-height: 24px;
-      }
-
-      .add {
-        font-size: 30rpx;
-
-        font-weight: 500;
-        color: #e6b873;
-      }
-
-      .minus {
-        font-size: 30rpx;
-
-        font-weight: 500;
-        color: $dark-3;
-      }
-    }
-  }
+	.score-box {
+		margin: 20rpx;
+		border-radius: 20rpx;
+		padding-top: 100rpx;
+	}
+
+	.avatar-box {
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 50%;
+		overflow: hidden;
+
+		.avatar-img {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.value-box {
+		width: 100rpx;
+		height: 100rpx;
+		line-height: 100rpx;
+		text-align: center;
+		border-radius: 50%;
+		border: 2px solid #f6f6f6;
+	}
+
+	.btn {
+		width: 300rpx;
+		background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+		border-radius: 20rpx;
+		font-size: 30rpx;
+		font-weight: 500;
+		line-height: 80rpx;
+		color: $white;
+		position: relative;
+		z-index: 1;
+	}
+
+	.header-box {
+		width: 100%;
+		background: linear-gradient(180deg, var(--ui-BG-Main) 0%, var(--ui-BG-Main-gradient) 100%) no-repeat;
+		background-size: 750rpx 100%;
+		padding: 0 0 120rpx 0;
+		box-sizing: border-box;
+
+		.score-box {
+			height: 100%;
+
+			.all-num {
+				font-size: 50rpx;
+				font-weight: bold;
+				color: #fff;
+				font-family: OPPOSANS;
+			}
+
+			.all-title {
+				font-size: 26rpx;
+				font-weight: 500;
+				color: #fff;
+			}
+
+			.cicon-help-o {
+				color: #fff;
+				font-size: 28rpx;
+			}
+		}
+	}
+
+	// 筛选
+	.filter-box {
+		height: 114rpx;
+		background-color: $bg-page;
+
+		.total-box {
+			font-size: 24rpx;
+			font-weight: 500;
+			color: $dark-9;
+		}
+
+		.date-btn {
+			background-color: $white;
+			line-height: 54rpx;
+			border-radius: 27rpx;
+			padding: 0 20rpx;
+			font-size: 24rpx;
+			font-weight: 500;
+			color: $dark-6;
+
+			.ss-seldate-icon {
+				font-size: 50rpx;
+				color: $dark-9;
+			}
+		}
+	}
+
+	.list-box {
+		width: 500rpx;
+		height: 600rpx;
+		padding:0 20rpx;
+		overflow-y: auto;
+
+		.list-item {
+
+			background: #fff;
+			// border-bottom: 1rpx solid #dfdfdf;
+			padding: 30rpx;
+
+			.name {
+				font-size: 28rpx;
+
+				font-weight: 500;
+				color: rgba(102, 102, 102, 1);
+				line-height: 28rpx;
+				// margin-bottom: 20rpx;
+			}
+
+			.time {
+				font-size: 24rpx;
+
+				font-weight: 500;
+				color: rgba(196, 196, 196, 1);
+				line-height: 24px;
+			}
+
+			.add {
+				font-size: 30rpx;
+
+				font-weight: 500;
+				color: #e6b873;
+			}
+
+			.minus {
+				font-size: 30rpx;
+
+				font-weight: 500;
+				color: $dark-3;
+			}
+		}
+	}
 </style>

pages/user/wallet/scoreToMoney.vue

@@ -0,0 +1,177 @@
+<!-- 我的积分 -->
+<template>
+	<s-layout class="wallet-wrap" :bgStyle="{'backgroundColor':'#ffffff'}" title="积分兑换" navbar="normal">
+		<view class="score-box bg-white ss-flex-col ss-row-center ">
+			<view >
+				<view class="all-title ss-m-r-8 " style="border: 4rpx solid var(--ui-BG-Main);
+    width: 100%;
+    box-sizing: border-box;
+    height: 120rpx;text-indent: 20rpx;border-radius: 20rpx;line-height: 120rpx;">到数字人民币钱包：钱包地址/未绑定----></view>
+			</view>
+
+			<view class="ss-m-y-80 ">
+				<view class="all-title ss-m-r-8 ss-m-b-10">提现金额</view>
+				<view class="all-title ss-m-r-8 ss-m-y-30">
+					<input class="uni-input " style="border: 4rpx solid var(--ui-BG-Main);
+    width: 100%;
+    box-sizing: border-box;
+    height: 100rpx;text-indent: 20rpx;border-radius: 20rpx;" type="number" placeholder="请输入金额" />
+				</view>
+				<view class="all-title ss-m-r-8 ss-m-b-10 text-center">您当前可兑换金额:￥0</view>
+			</view>
+			<view class="ss-m-b-40 ss-flex ss-row-center">
+				<view class="all-title ss-m-r-80" @tap="sheep.$router.back('/pages/user/wallet/score')">
+					<button class="btn ss-reset-button ui-Shadow-Main">
+						取消
+					</button>
+				</view>
+				<view class="all-title ss-m-r-8">
+					<button class="btn ss-reset-button ui-Shadow-Main">
+						确定
+					</button>
+				</view>
+
+			</view>
+
+		</view>
+
+	</s-layout>
+
+</template>
+
+<script setup>
+	import sheep from '@/sheep';
+	import {
+		onLoad,
+		onReachBottom
+	} from '@dcloudio/uni-app';
+	import {
+		computed,
+		reactive
+	} from 'vue';
+	import _ from 'lodash';
+	import dayjs from 'dayjs';
+	import PointApi from '@/sheep/api/member/point';
+	import {
+		resetPagination
+	} from '@/sheep/util';
+
+	const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+	const userInfo = computed(() => sheep.$store('user').userInfo);
+	const sys_navBar = sheep.$platform.navbar;
+
+	const state = reactive({
+		currentTab: 0,
+		pagination: {
+			list: 0,
+			total: 0,
+			pageSize: 6,
+			pageNo: 1,
+		},
+		loadStatus: '',
+		date: [],
+		today: '',
+		showModel: false,
+		showQueModel: false
+	});
+	const close = () => {
+		state.showModel = false
+		state.showQueModel = false
+	}
+	const tabMaps = [{
+			name: '全部',
+			value: 'all',
+		},
+		{
+			name: '收入',
+			value: 'true',
+		},
+		{
+			name: '支出',
+			value: 'false',
+		},
+	];
+
+	const dateFilterText = computed(() => {
+		if (state.date[0] === state.date[1]) {
+			return state.date[0];
+		} else {
+			return state.date.join('~');
+		}
+	});
+
+	async function getLogList() {
+		state.loadStatus = 'loading';
+		let {
+			code,
+			data
+		} = await PointApi.getPointRecordPage({
+			pageNo: state.pagination.pageNo,
+			pageSize: state.pagination.pageSize,
+			addStatus: state.currentTab > 0 ? tabMaps[state.currentTab].value : undefined,
+			'createTime[0]': state.date[0] + ' 00:00:00',
+			'createTime[1]': state.date[1] + ' 23:59:59',
+		});
+		if (code !== 0) {
+			return;
+		}
+		state.pagination.list = data.list;
+		state.pagination.total = data.total;
+		state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+	}
+
+	onLoad(() => {
+		state.today = dayjs().format('YYYY-MM-DD');
+		state.date = [state.today, state.today];
+		getLogList();
+	});
+
+	function onChange(e) {
+		state.currentTab = e.index;
+		resetPagination(state.pagination);
+		getLogList();
+	}
+
+	function onChangeTime(e) {
+		state.date[0] = e[0];
+		state.date[1] = e[e.length - 1];
+		resetPagination(state.pagination);
+		getLogList();
+	}
+
+	function onLoadMore() {
+		if (state.loadStatus === 'noMore') {
+			return;
+		}
+		state.pagination.pageNo++;
+		getLogList();
+	}
+
+	onReachBottom(() => {
+		onLoadMore();
+	});
+</script>
+
+<style lang="scss" scoped>
+	.score-box {
+		margin: 20rpx;
+		border-radius: 20rpx;
+		padding-top: 50rpx;
+	}
+
+	input {}
+
+
+
+	.btn {
+		width: 200rpx;
+		background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+		border-radius: 20rpx;
+		font-size: 30rpx;
+		font-weight: 500;
+		line-height: 80rpx;
+		color: $white;
+		position: relative;
+		z-index: 1;
+	}
+</style>

pages/user/wallet/team.vue

@@ -0,0 +1,322 @@
+<!-- 我的积分 -->
+<template>
+	<s-layout class="wallet-wrap" :bgStyle="{'backgroundColor':'#ffffff'}" title="" navbar="normal">
+
+		<view class="model-box ss-flex-col">
+			<view class="all-title ss-p-x-30 ss-p-t-30">
+				团队成员 <text style="float: right;">共12345人</text>
+			</view>
+			<!-- 推荐老师 -->
+			<view class="list-box" style="width: 100%;">
+				<view v-if="state.pagination.total > 0">
+					<view class="list-item ss-flex ss-col-center ss-row-between "
+						style="padding: 30rpx 0;">
+						<view class="ss-flex ss-col-center" style="width: 100%;">
+							<view>
+								&nbsp;&nbsp;
+							</view>
+							<!-- 头像 -->
+							<view class="avatar-box ss-m-x-20">
+								<image class="avatar-img" :src="
+									    sheep.$url.static('/static/img/shop/default_avatar.png')" mode="aspectFill"></image>
+							</view>
+							<view class="ss-flex ss-m-t-10"
+								style="flex-direction: column;align-items: flex-start;width: calc(100% - 5.5rem);">
+								<view class="name" style="width: 100%;"> {{ name || '空' }} <text class="ss-m-l-16">推荐老师</text></view>
+								<view class="time " style="width: 100%;">
+									身价
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view>
+					<scroll-view style="width: 96%;" scroll-y="true" @touchmove.stop>
+						<view v-if="state.pagination.total > 0">
+							<view class="list-item ss-flex ss-col-center ss-row-between "
+								v-for="(item,index)  in state.pagination.list" :key="item.id" style="padding: 30rpx 0;">
+								<view class="ss-flex ss-col-center" style="width: 100%;">
+									<view>
+										{{index+1}}
+									</view>
+									<!-- 头像 -->
+									<view class="avatar-box ss-m-x-20">
+										<image class="avatar-img" :src="
+									    sheep.$url.static('/static/img/shop/default_avatar.png')" mode="aspectFill"></image>
+									</view>
+									<view class="ss-flex ss-m-t-10"
+										style="flex-direction: column;align-items: flex-start;width: calc(100% - 5.5rem);">
+										<view class="name" style="width: 100%;"> {{ item.name || '空' }} <text style="float: right;">消费额:￥32</text></view>
+										<view class="time " style="width: 100%;">
+											身价
+											<text style="float: right;">{{sheep.$helper.timeFormat(item.createTime, 'yyyy-mm-dd')}}</text>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+
+						<s-empty v-else text="暂无数据" icon="/static/data-empty.png" />
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+	</s-layout>
+
+</template>
+
+<script setup>
+	import sheep from '@/sheep';
+	import {
+		onLoad,
+		onReachBottom
+	} from '@dcloudio/uni-app';
+	import {
+		computed,
+		reactive
+	} from 'vue';
+	import _ from 'lodash';
+	import dayjs from 'dayjs';
+	import PointApi from '@/sheep/api/member/point';
+	import {
+		resetPagination
+	} from '@/sheep/util';
+
+	const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+	const userInfo = computed(() => sheep.$store('user').userInfo);
+	const sys_navBar = sheep.$platform.navbar;
+
+	const state = reactive({
+		currentTab: 0,
+		pagination: {
+			list: 0,
+			total: 0,
+			pageSize: 6,
+			pageNo: 1,
+		},
+		loadStatus: '',
+		date: [],
+		today: '',
+		showModel: false,
+		showQueModel: false
+	});
+	const close = () => {
+		state.showModel = false
+		state.showQueModel = false
+	}
+	const tabMaps = [{
+			name: '全部',
+			value: 'all',
+		},
+		{
+			name: '收入',
+			value: 'true',
+		},
+		{
+			name: '支出',
+			value: 'false',
+		},
+	];
+
+	const dateFilterText = computed(() => {
+		if (state.date[0] === state.date[1]) {
+			return state.date[0];
+		} else {
+			return state.date.join('~');
+		}
+	});
+
+	async function getLogList() {
+		state.loadStatus = 'loading';
+		let {
+			code,
+			data
+		} = await PointApi.getPointRecordPage({
+			pageNo: state.pagination.pageNo,
+			pageSize: state.pagination.pageSize,
+			addStatus: state.currentTab > 0 ? tabMaps[state.currentTab].value : undefined,
+			'createTime[0]': state.date[0] + ' 00:00:00',
+			'createTime[1]': state.date[1] + ' 23:59:59',
+		});
+		if (code !== 0) {
+			return;
+		}
+		state.pagination.list = data.list;
+		state.pagination.total = data.total;
+		state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+	}
+
+	onLoad(() => {
+		state.today = dayjs().format('YYYY-MM-DD');
+		state.date = [state.today, state.today];
+		getLogList();
+	});
+
+	function onChange(e) {
+		state.currentTab = e.index;
+		resetPagination(state.pagination);
+		getLogList();
+	}
+
+	function onChangeTime(e) {
+		state.date[0] = e[0];
+		state.date[1] = e[e.length - 1];
+		resetPagination(state.pagination);
+		getLogList();
+	}
+
+	function onLoadMore() {
+		if (state.loadStatus === 'noMore') {
+			return;
+		}
+		state.pagination.pageNo++;
+		getLogList();
+	}
+
+	onReachBottom(() => {
+		onLoadMore();
+	});
+</script>
+
+<style lang="scss" scoped>
+	.score-box {
+		margin: 20rpx;
+		border-radius: 20rpx;
+		padding-top: 100rpx;
+	}
+
+	.avatar-box {
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 50%;
+		overflow: hidden;
+
+		.avatar-img {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.value-box {
+		width: 100rpx;
+		height: 100rpx;
+		line-height: 100rpx;
+		text-align: center;
+		border-radius: 50%;
+		border: 2px solid #f6f6f6;
+	}
+
+	.btn {
+		width: 300rpx;
+		background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+		border-radius: 20rpx;
+		font-size: 30rpx;
+		font-weight: 500;
+		line-height: 80rpx;
+		color: $white;
+		position: relative;
+		z-index: 1;
+	}
+
+	.header-box {
+		width: 100%;
+		background: linear-gradient(180deg, var(--ui-BG-Main) 0%, var(--ui-BG-Main-gradient) 100%) no-repeat;
+		background-size: 750rpx 100%;
+		padding: 0 0 120rpx 0;
+		box-sizing: border-box;
+
+		.score-box {
+			height: 100%;
+
+			.all-num {
+				font-size: 50rpx;
+				font-weight: bold;
+				color: #fff;
+				font-family: OPPOSANS;
+			}
+
+			.all-title {
+				font-size: 26rpx;
+				font-weight: 500;
+				color: #fff;
+			}
+
+			.cicon-help-o {
+				color: #fff;
+				font-size: 28rpx;
+			}
+		}
+	}
+
+	// 筛选
+	.filter-box {
+		height: 114rpx;
+		background-color: $bg-page;
+
+		.total-box {
+			font-size: 24rpx;
+			font-weight: 500;
+			color: $dark-9;
+		}
+
+		.date-btn {
+			background-color: $white;
+			line-height: 54rpx;
+			border-radius: 27rpx;
+			padding: 0 20rpx;
+			font-size: 24rpx;
+			font-weight: 500;
+			color: $dark-6;
+
+			.ss-seldate-icon {
+				font-size: 50rpx;
+				color: $dark-9;
+			}
+		}
+	}
+
+	.list-box {
+		width: 500rpx;
+		height: 600rpx;
+		padding: 0 20rpx;
+		overflow-y: auto;
+
+		.list-item {
+
+			background: #fff;
+			// border-bottom: 1rpx solid #dfdfdf;
+			padding: 30rpx;
+
+			.name {
+				font-size: 28rpx;
+
+				font-weight: 500;
+				color: rgba(102, 102, 102, 1);
+				line-height: 28rpx;
+				// margin-bottom: 20rpx;
+			}
+
+			.time {
+				font-size: 24rpx;
+
+				font-weight: 500;
+				color: rgba(196, 196, 196, 1);
+				line-height: 24px;
+			}
+
+			.add {
+				font-size: 30rpx;
+
+				font-weight: 500;
+				color: #e6b873;
+			}
+
+			.minus {
+				font-size: 30rpx;
+
+				font-weight: 500;
+				color: $dark-3;
+			}
+		}
+	}
+</style>

sheep/components/s-user-card/s-user-card.vue

@@ -17,9 +17,9 @@
 				</view>
 			</view>
 			<view class="right-box ss-m-r-30">
-				<button class="ss-reset-button"  style="margin-right: 20rpx;">
+				<!-- <button class="ss-reset-button"  style="margin-right: 20rpx;">
 					<text class="cicon-service-o"></text>
-				</button>
+				</button> -->
 				<button class="ss-reset-button" @tap="sheep.$router.go('/pages/user/setting')">
 					<text class="cicon-settings-o"></text>
 				</button>

sheep/components/s-wallet-card/s-wallet-card.vue

@@ -1,38 +1,67 @@
 <!-- 装修用户组件：用户资产 -->
 <template>
-	<view class="ss-wallet-menu-wrap ss-flex ss-col-center">
-		<view class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
-			@tap="sheep.$router.go('/pages/user/wallet/money')">
-			<view class="value-box ss-flex ss-col-bottom">
-				<view class="value-text ss-line-1">{{ fen2yuan(userWallet.balance) || '0.00' }}</view>
-				<view class="unit-text ss-m-l-6">元</view>
+	<view>
+		<view class="progress-box" @tap="state.showProtocol = true">
+			<view class="progress-container">
+				<view class="progress-bar" :style="{ width: progressWidth + '%' }">
+					<text class="progress-text">身价：36级别 </text>
+				</view>
 			</view>
-			<view class="menu-title ss-m-t-28">账户余额</view>
 		</view>
-		<view class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
-			@tap="sheep.$router.go('/pages/user/wallet/score')">
-			<view class="value-box ss-flex ss-col-bottom">
-				<view class="value-text">{{ userInfo.point || 0 }}</view>
-				<view class="unit-text ss-m-l-6">个</view>
+		<view class="ss-wallet-menu-wrap ss-flex ss-col-center">
+			<view class="menu-item ss-flex-1 ss-flex-col  ss-col-center">
+				<view class="value-box ">
+					<view class="value-text ">看点</view>
+				</view>
+				<view class="menu-title ss-m-t-15">*888</view>
+				<view class="menu-title ss-m-t-15">看广告做任务得收益</view>
 			</view>
-			<view class="menu-title ss-m-t-28">积分</view>
-		</view>
-		<view class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center" @tap="
-        sheep.$router.go('/pages/coupon/list', {
-          type: 'geted',
-        })
-      ">
-			<view class="value-box ss-flex ss-col-bottom">
-				<view class="value-text">{{ numData.unusedCouponCount }}</view>
-				<view class="unit-text ss-m-l-6">张</view>
+			<view class="menu-item ss-flex-1 ss-flex-col  ss-col-center"
+				@tap="sheep.$router.go('/pages/user/wallet/score')">
+				<view class="value-box ">
+					<view class="value-text">积分</view>
+				</view>
+				<view class="menu-title ss-m-t-15">#{{ userInfo.point || 0 }}</view>
+				<view class="menu-title ss-m-t-15">=数字人民币:7263</view>
+				<!-- <view class="menu-title ss-m-t-15">=NFR(数字资产):87263</view> -->
+				<view class="menu-mini-title ss-m-t-15">[按32小时市场均值实时换算]</view>
+			</view>
+			<view class="menu-item ss-flex-1 ss-flex-col  ss-col-center"
+				@tap="sheep.$router.go('/pages/user/wallet/team')">
+				<view class="value-box ">
+					<view class="value-text">团队</view>
+				</view>
+				<view class="menu-title ss-m-t-15">88人</view>
+				<view class="menu-title ss-m-t-15">直推人今日贡献#92</view>
+				<view class="menu-title ss-m-t-15">直推人总贡献值#7692</view>
+			</view>
+			<view class="menu-item ss-flex-col  ss-col-center menu-wallet">
+				<view class="value-box ">
+					<view class="value-text">NFR</view>
+				</view>
+				<view class="menu-title ss-m-t-15">8734枚</view>
+				<view class="menu-title ss-m-t-15">历史转换数量</view>
+				<view class="menu-title ss-m-t-15">点击跳转查看行情</view>
 			</view>
-			<view class="menu-title ss-m-t-28">优惠券</view>
-		</view>
-		<view class="menu-item ss-flex-col ss-row-center ss-col-center menu-wallet"
-          @tap="sheep.$router.go('/pages/user/wallet/money')">
-			<image class="item-icon" :src="sheep.$url.static('/static/img/shop/user/wallet_icon.png')" mode="aspectFit" />
-			<view class="menu-title ss-m-t-30">我的钱包</view>
 		</view>
+
+		<!-- 积分确权 -->
+		<su-popup :show="state.showProtocol" type="center" round="10" :isMaskClick="false" showClose @close="close">
+			<view class="head-nav">
+				<view :class="state.navIndex==0?'activite':''" class="ss-m-l-20" @click="checkIndex(0)">
+					身价产生规则
+				</view>
+				<view :class="state.navIndex==1?'activite':''" class="ss-m-l-20" @click="checkIndex(1)">
+					身价权益
+				</view>
+			</view>
+			<scroll-view class="scroll-view_H" scroll-y="true">
+				<richtext title="身价产生规则" v-if="state.navIndex==0" type='tab' />
+				<richtext title="身价权益" v-if="state.navIndex==1" type='tab' />
+			</scroll-view>
+
+
+		</su-popup>
 	</view>
 </template>
 
@@ -40,27 +69,150 @@
 	/**
 	 * 装修组件 - 订单菜单组
 	 */
-	import { computed } from 'vue';
+	import {
+		computed,
+		reactive
+	} from 'vue';
 	import sheep from '@/sheep';
-  import { fen2yuan } from '../../hooks/useGoods';
+	import {
+		fen2yuan
+	} from '../../hooks/useGoods';
+	import richtext from '@/pages/public/richtext'
 
+	const progressWidth = 90
+	const state = reactive({
+		showProtocol: false,
+		navIndex: 0
+	})
 	const userWallet = computed(() => sheep.$store('user').userWallet);
 	const userInfo = computed(() => sheep.$store('user').userInfo);
 	const numData = computed(() => sheep.$store('user').numData);
+	// 查看协议
+	function onProtocol(title) {
+		sheep.$router.go('/pages/public/richtext', {
+			title,
+		});
+	}
+	const close = () => {
+		state.showProtocol = false
+	}
+
+	function checkIndex(index) {
+		state.navIndex = index;
+	}
 </script>
 
 <style lang="scss" scoped>
+	.head-nav {
+		margin: 20rpx auto;
+		display: flex;
+		align-items: center;
+		color: #CCCCCC;
+		
+	}
+
+	.activite {
+		box-sizing: border-box;
+		color: rgb(14, 147, 46);
+		border-bottom: 4rpx solid rgb(14, 147, 46);
+	}
+
+	.head-nav>view {
+		padding-bottom: 10rpx;
+	}
+
+	.content {
+		/* background: #008000; */
+		height: 100%;
+	}
+
+	.scroll-view_H {
+		width: 600rpx;
+		height: 700rpx;
+		padding: 20rpx;
+	}
+
+	.progress-box {
+		padding: 40rpx 40rpx 0;
+	}
+
+	/* 进度条容器 */
+	.progress-container {
+		width: 100%;
+		/* 全宽 */
+		height: 40rpx;
+		/* 高度 */
+		background-color: #e0e0e0;
+		/* 背景色 */
+		border-radius: 20rpx;
+		/* 圆角 */
+		position: relative;
+		/* 相对定位，用于文本定位 */
+
+	}
+
+	/* 进度条 */
+	.progress-bar {
+		height: 100%;
+		background: rgb(14, 147, 46);
+		/* 渐变色 */
+		border-radius: 20rpx;
+		/* 圆角 */
+		position: relative;
+		/* 相对定位，用于文本定位 */
+		display: flex;
+		/* 开启 Flex 布局 */
+		align-items: center;
+		/* 垂直居中 */
+		justify-content: center;
+		/* 水平居中 */
+	}
+
+	/* 进度文本 */
+	.progress-text {
+		color: white;
+		/* 文本颜色 */
+		font-size: 14px;
+		/* 字体大小 */
+	}
+
 	.ss-wallet-menu-wrap {
+		flex-wrap: wrap;
+		height: auto;
+		padding: 40rpx;
+
 		.menu-wallet {
 			width: 144rpx;
 		}
 
+		.menu-item:nth-child(1),
+		.menu-item:nth-child(2) {
+			border-bottom: 4rpx solid #f6f6f6;
+		}
+
+		.menu-item:nth-child(odd) {
+			border-right: 4rpx solid #f6f6f6;
+		}
+
 		.menu-item {
-			height: 160rpx;
+			height: 300rpx;
+			flex: 0 0 50%;
+			/* flex-grow: 0, flex-shrink: 0, flex-basis: 50% */
+			box-sizing: border-box;
+			padding: 20rpx;
+			/* 确保 padding 和 border 不会使元素宽度超过 50% */
 
+			/* 可选，为了视觉效果 */
 			.menu-title {
-				font-size: 24rpx;
-				line-height: 24rpx;
+				font-size: 26rpx;
+				line-height: 26rpx;
+				color: #333333;
+			}
+
+			/* 可选，为了视觉效果 */
+			.menu-mini-title {
+				font-size: 20rpx;
+				line-height: 20rpx;
 				color: #333333;
 			}
 
@@ -70,13 +222,17 @@
 			}
 
 			.value-box {
-				height: 50rpx;
+				width: 100rpx;
+				height: 100rpx;
+				line-height: 100rpx;
 				text-align: center;
+				border-radius: 50%;
+				border: 2px solid #f6f6f6;
 
 				.value-text {
 					font-size: 28rpx;
 					color: #000000;
-					line-height: 28rpx;
+					line-height: 100rpx;
 					vertical-align: text-bottom;
 					font-family: OPPOSANS;
 				}
@@ -89,5 +245,4 @@
 			}
 		}
 	}
-</style>
-
+</style>

sheep/store/app.js

@@ -135,8 +135,10 @@ const adaptTemplate = async (appTemplate, templateId) => {
 			appTemplate.basic.theme = tabBar?.theme;
 		}
 	}
+	
 	appTemplate.home = diyTemplate?.home;
 	appTemplate.user = diyTemplate?.user;
+	console.log(diyTemplate.user)
 }
 
 export default app;

sheep/store/user.js

@@ -49,7 +49,7 @@ const user = defineStore({
 	id: 'user',
 	state: () => ({
 		userInfo: clone(defaultUserInfo), // 用户信息
-    userWallet: clone(defaultUserWallet), // 用户钱包信息
+		userWallet: clone(defaultUserWallet), // 用户钱包信息
 		isLogin: !!uni.getStorageSync('token'), // 登录状态
 		numData: cloneDeep(defaultNumData), // 用户其他数据
 		lastUpdateTime: 0, // 上次更新时间

unpackage/dist/build/h5/assets/address.3315eae3.js

@@ -0,0 +1 @@
+import{R as e}from"./index-404edd75.js";const s={getAddressList:()=>e({url:"/member/address/list",method:"GET"}),createAddress:s=>e({url:"/member/address/create",method:"POST",data:s,custom:{showSuccess:!0,successMsg:"保存成功"}}),updateAddress:s=>e({url:"/member/address/update",method:"PUT",data:s,custom:{showSuccess:!0,successMsg:"更新成功"}}),getAddress:s=>e({url:"/member/address/get",method:"GET",params:{id:s}}),deleteAddress:s=>e({url:"/member/address/delete",method:"DELETE",params:{id:s}})};export{s as A};

unpackage/dist/build/h5/assets/address.a1e89c5a.js

@@ -1 +0,0 @@
-import{a6 as e}from"./index-44b9db5a.js";const s={getAddressList:()=>e({url:"/member/address/list",method:"GET"}),createAddress:s=>e({url:"/member/address/create",method:"POST",data:s,custom:{showSuccess:!0,successMsg:"保存成功"}}),updateAddress:s=>e({url:"/member/address/update",method:"PUT",data:s,custom:{showSuccess:!0,successMsg:"更新成功"}}),getAddress:s=>e({url:"/member/address/get",method:"GET",params:{id:s}}),deleteAddress:s=>e({url:"/member/address/delete",method:"DELETE",params:{id:s}})};export{s as A};

unpackage/dist/build/h5/assets/afterSale.0dbb417c.js

@@ -0,0 +1 @@
+import{R as e}from"./index-404edd75.js";const a={getAfterSalePage:a=>e({url:"/trade/after-sale/page",method:"GET",params:a,custom:{showLoading:!1}}),createAfterSale:a=>e({url:"/trade/after-sale/create",method:"POST",data:a}),getAfterSale:a=>e({url:"/trade/after-sale/get",method:"GET",params:{id:a}}),cancelAfterSale:a=>e({url:"/trade/after-sale/cancel",method:"DELETE",params:{id:a}}),getAfterSaleLogList:a=>e({url:"/trade/after-sale-log/list",method:"GET",params:{afterSaleId:a}}),deliveryAfterSale:a=>e({url:"/trade/after-sale/delivery",method:"PUT",data:a})};export{a as A};

unpackage/dist/build/h5/assets/afterSale.d34c7c30.js

@@ -1 +0,0 @@
-import{a6 as e}from"./index-44b9db5a.js";const a={getAfterSalePage:a=>e({url:"/trade/after-sale/page",method:"GET",params:a,custom:{showLoading:!1}}),createAfterSale:a=>e({url:"/trade/after-sale/create",method:"POST",data:a}),getAfterSale:a=>e({url:"/trade/after-sale/get",method:"GET",params:{id:a}}),cancelAfterSale:a=>e({url:"/trade/after-sale/cancel",method:"DELETE",params:{id:a}}),getAfterSaleLogList:a=>e({url:"/trade/after-sale-log/list",method:"GET",params:{afterSaleId:a}}),deliveryAfterSale:a=>e({url:"/trade/after-sale/delivery",method:"PUT",data:a})};export{a as A};

unpackage/dist/build/h5/assets/area.2d41f7e3.js

@@ -0,0 +1 @@
+import{R as e}from"./index-404edd75.js";const r={getAreaTree:()=>e({url:"/system/area/tree",method:"GET"})};export{r as A};

unpackage/dist/build/h5/assets/area.f2d778d6.js

@@ -1 +0,0 @@
-import{a6 as e}from"./index-44b9db5a.js";const r={getAreaTree:()=>e({url:"/system/area/tree",method:"GET"})};export{r as A};

unpackage/dist/build/h5/assets/article.34de4789.js

@@ -1 +0,0 @@
-import{a6 as t}from"./index-44b9db5a.js";const e={getArticle:(e,o)=>t({url:"/promotion/article/get",method:"GET",params:{id:e,title:o}})};export{e as A};

unpackage/dist/build/h5/assets/brokerage.827f31de.js

@@ -1 +0,0 @@
-import{a6 as e}from"./index-44b9db5a.js";const r={getBrokerageUser:()=>e({url:"/trade/brokerage-user/get",method:"GET"}),getBrokerageUserSummary:()=>e({url:"/trade/brokerage-user/get-summary",method:"GET"}),getBrokerageRecordPage:r=>{void 0===r.status&&delete r.status;const t=Object.keys(r).map((e=>encodeURIComponent(e)+"="+r[e])).join("&");return e({url:`/trade/brokerage-record/page?${t}`,method:"GET"})},createBrokerageWithdraw:r=>e({url:"/trade/brokerage-withdraw/create",method:"POST",data:r}),getProductBrokeragePrice:r=>e({url:"/trade/brokerage-record/get-product-brokerage-price",method:"GET",params:{spuId:r}}),getRankByPrice:r=>{const t=`times=${r.times[0]}&times=${r.times[1]}`;return e({url:`/trade/brokerage-user/get-rank-by-price?${t}`,method:"GET"})},getBrokerageUserChildSummaryPageByPrice:r=>{const t=Object.keys(r).map((e=>encodeURIComponent(e)+"="+r[e])).join("&");return e({url:`/trade/brokerage-user/rank-page-by-price?${t}`,method:"GET"})},getBrokerageUserRankPageByUserCount:r=>{const t=Object.keys(r).map((e=>encodeURIComponent(e)+"="+r[e])).join("&");return e({url:`/trade/brokerage-user/rank-page-by-user-count?${t}`,method:"GET"})},getBrokerageUserChildSummaryPage:r=>e({url:"/trade/brokerage-user/child-summary-page",method:"GET",params:r})};export{r as B};

unpackage/dist/build/h5/assets/brokerage.c167e45c.js

@@ -0,0 +1 @@
+import{R as e}from"./index-404edd75.js";const r={getBrokerageUser:()=>e({url:"/trade/brokerage-user/get",method:"GET"}),getBrokerageUserSummary:()=>e({url:"/trade/brokerage-user/get-summary",method:"GET"}),getBrokerageRecordPage:r=>{void 0===r.status&&delete r.status;const t=Object.keys(r).map((e=>encodeURIComponent(e)+"="+r[e])).join("&");return e({url:`/trade/brokerage-record/page?${t}`,method:"GET"})},createBrokerageWithdraw:r=>e({url:"/trade/brokerage-withdraw/create",method:"POST",data:r}),getProductBrokeragePrice:r=>e({url:"/trade/brokerage-record/get-product-brokerage-price",method:"GET",params:{spuId:r}}),getRankByPrice:r=>{const t=`times=${r.times[0]}&times=${r.times[1]}`;return e({url:`/trade/brokerage-user/get-rank-by-price?${t}`,method:"GET"})},getBrokerageUserChildSummaryPageByPrice:r=>{const t=Object.keys(r).map((e=>encodeURIComponent(e)+"="+r[e])).join("&");return e({url:`/trade/brokerage-user/rank-page-by-price?${t}`,method:"GET"})},getBrokerageUserRankPageByUserCount:r=>{const t=Object.keys(r).map((e=>encodeURIComponent(e)+"="+r[e])).join("&");return e({url:`/trade/brokerage-user/rank-page-by-user-count?${t}`,method:"GET"})},getBrokerageUserChildSummaryPage:r=>e({url:"/trade/brokerage-user/child-summary-page",method:"GET",params:r})};export{r as B};

unpackage/dist/build/h5/assets/category.4ed41703.js

@@ -1 +0,0 @@
-import{a6 as t}from"./index-44b9db5a.js";const o={getCategoryList:()=>t({url:"/product/category/list",method:"GET"}),getCategoryListByIds:o=>t({url:"/product/category/list-by-ids",method:"GET",params:{ids:o}})};export{o as C};

unpackage/dist/build/h5/assets/category.f536e929.js

@@ -0,0 +1 @@
+import{R as t}from"./index-404edd75.js";const o={getCategoryList:()=>t({url:"/product/category/list",method:"GET"}),getCategoryListByIds:o=>t({url:"/product/category/list-by-ids",method:"GET",params:{ids:o}})};export{o as C};

unpackage/dist/build/h5/assets/combination.0a5c5497.js

@@ -0,0 +1 @@
+import{R as o}from"./index-404edd75.js";const t={getCombinationActivityList:t=>o({url:"/promotion/combination-activity/list",method:"GET",params:{count:t}}),getCombinationActivityPage:t=>o({url:"/promotion/combination-activity/page",method:"GET",params:t}),getCombinationActivity:t=>o({url:"/promotion/combination-activity/get-detail",method:"GET",params:{id:t}}),getHeadCombinationRecordList:(t,i,a)=>o({url:"/promotion/combination-record/get-head-list",method:"GET",params:{activityId:t,status:i,count:a}}),getCombinationRecordPage:t=>o({url:"/promotion/combination-record/page",method:"GET",params:t}),getCombinationRecordDetail:t=>o({url:"/promotion/combination-record/get-detail",method:"GET",params:{id:t}}),getCombinationRecordSummary:()=>o({url:"/promotion/combination-record/get-summary",method:"GET"})};export{t as C};

unpackage/dist/build/h5/assets/combination.1d0a80d8.js

@@ -1 +0,0 @@
-import{a6 as o}from"./index-44b9db5a.js";const t={getCombinationActivityList:t=>o({url:"/promotion/combination-activity/list",method:"GET",params:{count:t}}),getCombinationActivityPage:t=>o({url:"/promotion/combination-activity/page",method:"GET",params:t}),getCombinationActivity:t=>o({url:"/promotion/combination-activity/get-detail",method:"GET",params:{id:t}}),getHeadCombinationRecordList:(t,i,a)=>o({url:"/promotion/combination-record/get-head-list",method:"GET",params:{activityId:t,status:i,count:a}}),getCombinationRecordPage:t=>o({url:"/promotion/combination-record/page",method:"GET",params:t}),getCombinationRecordDetail:t=>o({url:"/promotion/combination-record/get-detail",method:"GET",params:{id:t}}),getCombinationRecordSummary:()=>o({url:"/promotion/combination-record/get-summary",method:"GET"})};export{t as C};

unpackage/dist/build/h5/assets/config.6219f0d3.js

@@ -1 +0,0 @@
-import{a6 as e}from"./index-44b9db5a.js";const o={getTradeConfig:()=>e({url:"/trade/config/get",method:"GET"})};export{o as T};

unpackage/dist/build/h5/assets/config.89e6c2b9.js

@@ -0,0 +1 @@
+import{R as e}from"./index-404edd75.js";const o={getTradeConfig:()=>e({url:"/trade/config/get",method:"GET"})};export{o as T};

unpackage/dist/build/h5/assets/const.220990a7.js

@@ -0,0 +1 @@
+import{R as t,b3 as e}from"./index-404edd75.js";const i={getSeckillConfigList:()=>t({url:"promotion/seckill-config/list",method:"GET"}),getNowSeckillActivity:()=>t({url:"promotion/seckill-activity/get-now",method:"GET"}),getSeckillActivityPage:e=>t({url:"promotion/seckill-activity/page",method:"GET",params:e}),getSeckillActivity:e=>t({url:"promotion/seckill-activity/get-detail",method:"GET",params:{id:e}})},o={PRICE:{type:1,name:"满减"},PERCENT:{type:2,name:"折扣"}},l={DATE:{type:1,name:"固定日期可用"},TERM:{type:2,name:"领取之后可用"}},a={WAIT_START:"即将开始",STARTED:"进行中",END:"已结束"},s=(t,i)=>{const o=e();return o.isBefore(t)?a.WAIT_START:o.isAfter(i)?a.END:a.STARTED};export{l as C,o as P,i as S,a as T,s as g};

unpackage/dist/build/h5/assets/const.73e580a1.js

@@ -1 +0,0 @@
-import{a6 as t,b3 as e}from"./index-44b9db5a.js";const i={getSeckillConfigList:()=>t({url:"promotion/seckill-config/list",method:"GET"}),getNowSeckillActivity:()=>t({url:"promotion/seckill-activity/get-now",method:"GET"}),getSeckillActivityPage:e=>t({url:"promotion/seckill-activity/page",method:"GET",params:e}),getSeckillActivity:e=>t({url:"promotion/seckill-activity/get-detail",method:"GET",params:{id:e}})},o={PRICE:{type:1,name:"满减"},PERCENT:{type:2,name:"折扣"}},a={DATE:{type:1,name:"固定日期可用"},TERM:{type:2,name:"领取之后可用"}},l={WAIT_START:"即将开始",STARTED:"进行中",END:"已结束"},s=(t,i)=>{const o=e();return o.isBefore(t)?l.WAIT_START:o.isAfter(i)?l.END:l.STARTED};export{a as C,o as P,i as S,l as T,s as g};

unpackage/dist/build/h5/assets/favorite.b57679d4.js

@@ -1 +0,0 @@
-import{a6 as e}from"./index-44b9db5a.js";const t={getFavoritePage:t=>e({url:"/product/favorite/page",method:"GET",params:t}),isFavoriteExists:t=>e({url:"/product/favorite/exits",method:"GET",params:{spuId:t}}),createFavorite:t=>e({url:"/product/favorite/create",method:"POST",data:{spuId:t},custom:{auth:!0,showSuccess:!0,successMsg:"收藏成功"}}),deleteFavorite:t=>e({url:"/product/favorite/delete",method:"DELETE",data:{spuId:t},custom:{auth:!0,showSuccess:!0,successMsg:"取消成功"}})};export{t as F};

unpackage/dist/build/h5/assets/favorite.e605ecc4.js

@@ -0,0 +1 @@
+import{R as e}from"./index-404edd75.js";const t={getFavoritePage:t=>e({url:"/product/favorite/page",method:"GET",params:t}),isFavoriteExists:t=>e({url:"/product/favorite/exits",method:"GET",params:{spuId:t}}),createFavorite:t=>e({url:"/product/favorite/create",method:"POST",data:{spuId:t},custom:{auth:!0,showSuccess:!0,successMsg:"收藏成功"}}),deleteFavorite:t=>e({url:"/product/favorite/delete",method:"DELETE",data:{spuId:t},custom:{auth:!0,showSuccess:!0,successMsg:"取消成功"}})};export{t as F};

unpackage/dist/build/h5/assets/history.7751b547.js

@@ -0,0 +1 @@
+import{R as s}from"./index-404edd75.js";const o={deleteBrowseHistory:o=>s({url:"/product/browse-history/delete",method:"DELETE",data:{spuIds:o},custom:{showSuccess:!0,successMsg:"删除成功"}}),cleanBrowseHistory:()=>s({url:"/product/browse-history/clean",method:"DELETE",custom:{showSuccess:!0,successMsg:"清空成功"}}),getBrowseHistoryPage:o=>s({url:"/product/browse-history/page",method:"GET",data:o,custom:{showLoading:!1}})};export{o as S};

unpackage/dist/build/h5/assets/history.f245f652.js

@@ -1 +0,0 @@
-import{a6 as s}from"./index-44b9db5a.js";const o={deleteBrowseHistory:o=>s({url:"/product/browse-history/delete",method:"DELETE",data:{spuIds:o},custom:{showSuccess:!0,successMsg:"删除成功"}}),cleanBrowseHistory:()=>s({url:"/product/browse-history/clean",method:"DELETE",custom:{showSuccess:!0,successMsg:"清空成功"}}),getBrowseHistoryPage:o=>s({url:"/product/browse-history/page",method:"GET",data:o,custom:{showLoading:!1}})};export{o as S};

unpackage/dist/build/h5/assets/index.ab14311e.js

@@ -1 +0,0 @@
-import{b3 as t}from"./index-44b9db5a.js";const r=t=>{let r="0.00";if(void 0===t)return r;const e=(t=>{if(void 0===t)return 0;const r="string"==typeof t?parseFloat(t):t;return parseFloat((r/100).toFixed(2))})(t),n=e.toString().split(".")[1];switch(n?n.length:0){case 0:r=e.toString()+".00";break;case 1:r=e.toString()+".0";break;case 2:r=e.toString()}return r};function e(r,e){return r?(void 0===e&&(e="YYYY-MM-DD HH:mm:ss"),t(r).format(e)):""}function n(t,r="id",e="parentId",n="children",i=0){const o=JSON.parse(JSON.stringify(t)),s=o.filter((t=>{let n=o.filter((n=>t[r]===n[e]));return n.length>0&&(t.children=n),t[e]===i}));return""!==s?s:t}function i(t){t.list=[],t.total=0,t.pageNo=1}export{e as a,r as f,n as h,i as r};

unpackage/dist/build/h5/assets/pages-index-index.035f97dd.js

@@ -0,0 +1 @@
+import{h as s,c as e,o as t,s as o,$ as a,a as p,b as r,d as l,u as i,e as m,f as n,w as u,g as d,i as _,j as y,k as c,r as g,F as j,l as b,m as v}from"./index-404edd75.js";import{_ as f,a as x}from"./s-block.7a0fbadf.js";import{_ as h}from"./s-layout.9526755a.js";import"./_plugin-vue_export-helper.1b428a4d.js";import"./uni-list.cfb2aa7d.js";import"./su-image.3619e18e.js";import"./su-swiper.0469ebda.js";import"./s-goods-column.aa5c8bca.js";import"./useGoods.d2e3b545.js";/* empty css                                                                     */import"./uni-load-more.8050d0e2.js";/* empty css                                                                *//* empty css                                                                      */import"./spu.8e3fa71f.js";import"./combination.0a5c5497.js";import"./const.220990a7.js";import"./mp-html.2d845e45.js";import"./richtext.e86623d7.js";const k={__name:"index",setup(k){s();const S=e((()=>{var s;return null==(s=o.$store("app").template)?void 0:s.home}));return console.log(S),t((s=>{s.templateId&&o.$store("app").init(s.templateId),s.spm&&a.decryptSpm(s.spm),s.page&&o.$router.go(decodeURIComponent(s.page))})),p((()=>{o.$store("app").init(),setTimeout((function(){r()}),800)})),l((()=>{})),(s,e)=>{const t=b(v("s-block-item"),f),o=b(v("s-block"),x),a=b(v("s-layout"),h),p=_;return i(S)?(m(),n(p,{key:0},{default:u((()=>{var s;return[y(a,{title:"首页",navbar:"custom",tabbar:"/pages/index/index",bgStyle:i(S).page,navbarStyle:null==(s=i(S).style)?void 0:s.navbar,onShareAppMessage:""},{default:u((()=>[(m(!0),c(j,null,g(i(S).components,((s,e)=>(m(),n(o,{key:e,styles:s.property.style},{default:u((()=>[y(t,{type:s.id,data:s.property,styles:s.property.style},null,8,["type","data","styles"])])),_:2},1032,["styles"])))),128))])),_:1},8,["bgStyle","navbarStyle"])]})),_:1})):d("",!0)}}};export{k as default};

unpackage/dist/build/h5/assets/pages-index-index.1141f8fe.js

@@ -1 +0,0 @@
-import{h as s,c as e,o as t,s as a,$ as o,a as p,b as r,d as i,u as l,e as m,f as n,w as u,g as d,i as _,j as y,k as c,r as j,F as g,l as b,m as v}from"./index-44b9db5a.js";import{_ as f,a as x}from"./s-block.94206e0f.js";import{_ as k}from"./s-layout.502d2edd.js";import"./_plugin-vue_export-helper.1b428a4d.js";import"./uni-list.d057a815.js";import"./su-image.aa1d1d20.js";import"./su-swiper.abbccaaf.js";import"./s-goods-column.df21dce8.js";import"./useGoods.55474ad0.js";import"./index.ab14311e.js";/* empty css                                                                     */import"./uni-load-more.e4deef09.js";/* empty css                                                                *//* empty css                                                                      */import"./spu.92746938.js";import"./combination.1d0a80d8.js";import"./const.73e580a1.js";import"./mp-html.5f288a95.js";import"./article.34de4789.js";const S={__name:"index",setup(S){s();const $=e((()=>{var s;return null==(s=a.$store("app").template)?void 0:s.home}));return t((s=>{s.templateId&&a.$store("app").init(s.templateId),s.spm&&o.decryptSpm(s.spm),s.page&&a.$router.go(decodeURIComponent(s.page))})),p((()=>{a.$store("app").init(),setTimeout((function(){r()}),800)})),i((()=>{})),(s,e)=>{const t=b(v("s-block-item"),f),a=b(v("s-block"),x),o=b(v("s-layout"),k),p=_;return l($)?(m(),n(p,{key:0},{default:u((()=>{var s;return[y(o,{title:"首页",navbar:"custom",tabbar:"/pages/index/index",bgStyle:l($).page,navbarStyle:null==(s=l($).style)?void 0:s.navbar,onShareAppMessage:""},{default:u((()=>[(m(!0),c(g,null,j(l($).components,((s,e)=>(m(),n(a,{key:e,styles:s.property.style},{default:u((()=>[y(t,{type:s.id,data:s.property,styles:s.property.style},null,8,["type","data","styles"])])),_:2},1032,["styles"])))),128))])),_:1},8,["bgStyle","navbarStyle"])]})),_:1})):d("",!0)}}};export{S as default};

unpackage/dist/build/h5/assets/pages-index-login.c353924a.js → unpackage/dist/build/h5/assets/pages-index-login.3dcc2b82.js

@@ -1 +1 @@
-import{o as a,s as e,I as r,J as s,K as o,e as t,f as n,i}from"./index-44b9db5a.js";const l={__name:"login",setup:l=>(a((async a=>{new URLSearchParams(location.search).forEach(((e,r)=>{a[r]=e}));const t=a.event,n=a.code,i=a.state;"login"===t?await e.$platform.useProvider().login(n,i):"bind"===t&&e.$platform.useProvider().bind(n,i);let l=r("returnUrl");l?(s("returnUrl"),location.replace(l)):o({url:"/"})})),(a,e)=>{const r=i;return t(),n(r)})};export{l as default};
+import{o as a,s as e,I as r,J as s,K as o,e as t,f as n,i}from"./index-404edd75.js";const l={__name:"login",setup:l=>(a((async a=>{new URLSearchParams(location.search).forEach(((e,r)=>{a[r]=e}));const t=a.event,n=a.code,i=a.state;"login"===t?await e.$platform.useProvider().login(n,i):"bind"===t&&e.$platform.useProvider().bind(n,i);let l=r("returnUrl");l?(s("returnUrl"),location.replace(l)):o({url:"/"})})),(a,e)=>{const r=i;return t(),n(r)})};export{l as default};