浏览代码

2023-10-20

zhang 2 年之前
父节点
当前提交
0edd063178

+ 13 - 2
api/user.js

@@ -19,14 +19,25 @@ export function getUser(data) {
 }
 
 //用户推荐用户列表
-export function spread(data) {
+export function spread_se(data) {
 	return request({
-		url: '/spread/people/1',
+		url: `/api/spread/people/${data.id}`,
 		method: 'get',
 		data
 	});
 }
 		
+		
+		//用户推荐用户列表
+		export function spread(data) {
+			return request({
+				url: `/api/spread/people`,
+				method: 'post',
+				data
+			});
+		}
+				
+		
 
 
 

+ 0 - 201
components/uqrcodejs/LICENSE.md

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

文件差异内容过多而无法显示
+ 0 - 207
components/uqrcodejs/README.md


+ 0 - 27
components/uqrcodejs/package.json

@@ -1,27 +0,0 @@
-{
-  "name": "uqrcodejs",
-  "version": "4.0.7",
-  "description": "uQRCode是一款基于Javascript环境开发的二维码生成插件,适用所有Javascript运行环境的前端应用和Node.js。",
-  "main": "uqrcode.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Sansnn/uQRCode.git"
-  },
-  "keywords": [
-    "uQRCode",
-    "QR",
-    "QRCode",
-    "artQRCode",
-    "二维码",
-    "艺术码"
-  ],
-  "author": "Sansnn",
-  "license": "Apache-2.0",
-  "bugs": {
-    "url": "https://github.com/Sansnn/uQRCode/issues"
-  },
-  "homepage": "https://github.com/Sansnn/uQRCode#readme"
-}

文件差异内容过多而无法显示
+ 0 - 33
components/uqrcodejs/uqrcode.js


+ 2 - 1
libs/i18n/lang/cn.json

@@ -145,7 +145,8 @@
 		"a2": "k线类型",
 		"a3": "5分线",
 		"a4": "互娱金额",
-		"a5": "开奖时间"
+		"a5": "开奖时间",
+		"a6": "已开奖"
 	},
 	"huiyuan": {
 		"a1": "直推人数",

+ 2 - 1
libs/i18n/lang/en.json

@@ -127,7 +127,8 @@
 		"a2": "k types",
 		"a3": "5-point line",
 		"a4": "Game amount",
-		"a5": "Lottery opening time"
+		"a5": "Lottery opening time",
+		"a6": "Awarded"
 	},
 	"huiyuan": {
 		"a1": "Recommends",

+ 2 - 1
libs/i18n/lang/tw.json

@@ -145,7 +145,8 @@
 		"a2": "k線類型",
 		"a3": "5分線",
 		"a4": "互娛金額",
-		"a5": "開獎時間"
+		"a5": "開獎時間",
+		"a6": "已開獎"
 	},
 	"huiyuan": {
 		"a1": "直推人數",

+ 1 - 0
pages/game/history.vue

@@ -58,6 +58,7 @@
 					let list = res.data.bet_log
 					that.list = that.list.concat(list)
 					that.page++
+					console.log('11111111', list);
 					if (list.length == that.limit) {
 						that.loadingType = 'more'
 					} else {

+ 1 - 1
pages/index/entertainment.vue

@@ -409,7 +409,7 @@
 				const that = this;
 				const da = (new Date()).getTime();
 				const timenum = that.history.next.open_time * 1000 - da;
-				console.log(timenum, that.history.next.open_time, da, '计算');
+				// console.log(timenum, that.history.next.open_time, da, '计算');
 				if (timenum > 0) {
 					that.time.H = Math.floor(timenum / 1000 / 60 / 60);
 					that.time.S = Math.floor(timenum / 1000 % 60)

+ 0 - 1
pages/user/money/recharge.vue

@@ -38,7 +38,6 @@
 	import {
 		qianBao
 	} from "@/api/wallet.js"
-	// import UQRCode from "@/components/uqrcodejs/uqrcode.js"; // npm install uqrcodejs
 	export default {
 		data() {
 			return {

+ 38 - 21
pages/user/shareQrCode.vue

@@ -1,43 +1,46 @@
 <template>
 	<view class="all" >
-		<view class="list" v-for="item in 12" :key="item" :style="{color: item.status === '待开奖' ? 'green' : item.status === '已中奖' ? 'red' : 'yellow'}">
+		<view class="list" v-for="item in list" :key="id">
 			<view class="listO">
-				<view class="li">{{$t('set.a7')}}2022010223{{$t('set.a8')}}</view>
-				<view class="lis">
+				<view class="li">{{$t('set.a7')}}{{item.room.no}}{{$t('set.a8')}}</view>
+				<view class="lis" v-if="item.status === 1">
+					<view class="liss">{{$t('gameList.a6')}}</view>
+				</view>
+				<view class="lis" v-else>
 					<view class="liss">{{$t('gameList.a1')}}</view>
 				</view>
 			</view>
 			<view class="listT">
 				<view class="TT">
 					<view class="lsT">{{$t('gameList.a2')}}:</view>
-					<view class="lisT">{{$t('gameList.a3')}}</view>
+					<view class="lisT">{{item.room.game.timebar}}</view>
 				</view>
 				<view class="TT">
 					<view class="lsT">{{$t('gameList.a4')}}:</view>
-					<view class="lisT">10.00U</view>
+					<view class="lisT">{{item.num}}U</view>
 				</view>
 				<view class="TT">
 					<view class="lsT">{{$t('gameList.a5')}}:</view>
-					<view class="lisT">2023/3/18 12:00</view>
+					<view class="lisT">{{item.open_time}}</view>
 				</view>
 			</view>
 		</view>
 	</view>
 </template>
 <script>
-	import {getGame,test } from '@/api/game.js'
+	import {gameBetList} from '@/api/game.js'
 	export default {
 		data() {
 			return {
-				item: [
-					{
-						status: '待开奖'
-					}
-				]
+				id: '',
+				page: 1,
+				limit: 10,
+				list: []
 			};
 		},
-		onLoad() {
-			this.getGame()
+		onLoad(option) {
+			this.id = option.id
+			this.gameBetList()
 			
 			uni.setNavigationBarTitle({
 				title: this.$t("tab.a9"),
@@ -54,13 +57,27 @@
 		},
 		methods: {
 			// 互娱记录
-			async getGame() {
-			  try {
-			    const res = await getGame();
-			    console.log('12312', res);
-			  } catch (error) {
-			    console.error('请求出错', error);
-			  }
+			gameBetList() {
+				let that = this
+				if (that.loadingType == 'loading' || that.loadingType == 'noMore') {
+					return
+				}
+				gameBetList({
+					page: that.page,
+					limit: that.limit,
+					id: that.id,
+				}).then(res => {
+					let list = res.data.bet_log
+					that.list = that.list.concat(list)
+					that.page++
+					console.log('11111111', list);
+					if (list.length == that.limit) {
+						that.loadingType = 'more'
+					} else {
+						that.loadingType = 'noMore'
+					}
+					that.loaded = true
+				})
 			}
 
 		}

+ 57 - 9
pages/user/vip/tabulation.vue

@@ -51,31 +51,79 @@
 </template>
 
 <script>
-	import {spread} from "@/api/user.js"
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import {spread, getUserInfo} from "@/api/user.js"
 	export default {
 		data() {
 			return {
-				
+				id: '',
+				page: 1,
+				limit: 10,
+				list: []
 			};
 		},
-		onLoad() {
-			this.spread();
+		onLoad(option) {
+			this.id = option.id
+			this.spread()
+			
 			uni.setNavigationBarTitle({
 				title: this.$t("tab.b1"),
 			});
 		},
+		//下拉刷新
+		onPullDownRefresh() {
+			let obj = this;
+			//监听下拉刷新动作的执行方法,每次手动下拉刷新都会执行一次
+			setTimeout(function() {
+				obj.loadCodeList();
+				uni.stopPullDownRefresh(); //停止下拉刷新动画
+			}, 1000);
+		},
+		
+		computed: {
+			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+		},
+		
 		methods: {
-			async spread() {
-				const res = await spread()
-				console.log('11', res);
+			// 会员记录
+			spread() {
+				// const id = this.userInfo.id
+				// console.log(this.userInfo,'dsadas');
+				let that = this
+				if (that.loadingType == 'loading' || that.loadingType == 'noMore') {
+					return
+				}
+				spread({
+					page: that.page,
+					limit: that.limit,
+					// id: that.userInfo.uid,
+				}).then(res => {
+					// that.list = data.list
+					let list = res.data.list
+					// that.list = that.list.concat(list)
+					// that.page++
+					console.log('list', list);
+					if (list.length == that.limit) {
+						that.loadingType = 'more'
+					} else {
+						that.loadingType = 'noMore'
+					}
+					that.loaded = true
+				}).catch(e=>{
+					console.log(e);
+				})
 			},
 			navX() {
 				uni.navigateTo({
 					url: '/pages/user/vip/details'
 				})
-			},
+			}
+	
 		}
-	}
+	};
 </script>
 
 <style lang="scss">

部分文件因为文件数量过多而无法显示