diff --git a/yudao-mall-uniapp-master/.env.development b/yudao-mall-uniapp-master/.env.development
index 829ede0..def1cc3 100644
--- a/yudao-mall-uniapp-master/.env.development
+++ b/yudao-mall-uniapp-master/.env.development
@@ -1 +1,2 @@
- SHOPRO_DEV_BASE_URL = https://yanghaodong.51vip.biz
\ No newline at end of file
+ # SHOPRO_DEV_BASE_URL = https://yanghaodong.51vip.biz
+ SHOPRO_DEV_BASE_URL = http://192.168.1.129:48080
\ No newline at end of file
diff --git a/yudao-mall-uniapp-master/pages.json b/yudao-mall-uniapp-master/pages.json
index 1e14b74..a1499c8 100644
--- a/yudao-mall-uniapp-master/pages.json
+++ b/yudao-mall-uniapp-master/pages.json
@@ -261,6 +261,42 @@
"group": "用户中心"
}
},
+ {
+ "path": "prize",
+ "style": {
+ "navigationBarTitleText": "抽奖"
+ },
+ "meta": {
+ "auth": true,
+ "sync": true,
+ "title": "抽奖活动",
+ "group": "用户中心"
+ }
+ },
+ {
+ "path": "PrizesWon",
+ "style": {
+ "navigationBarTitleText": "已获奖品"
+ },
+ "meta": {
+ "auth": true,
+ "sync": true,
+ "title": "抽奖活动",
+ "group": "用户中心"
+ }
+ },
+ {
+ "path": "ActivityRules",
+ "style": {
+ "navigationBarTitleText": "活动规则"
+ },
+ "meta": {
+ "auth": true,
+ "sync": true,
+ "title": "活动规则",
+ "group": "用户中心"
+ }
+ },
{
"path": "goods-collect",
"style": {
diff --git a/yudao-mall-uniapp-master/pages/user/ActivityRules.vue b/yudao-mall-uniapp-master/pages/user/ActivityRules.vue
new file mode 100644
index 0000000..955d7c1
--- /dev/null
+++ b/yudao-mall-uniapp-master/pages/user/ActivityRules.vue
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yudao-mall-uniapp-master/pages/user/PrizesWon.vue b/yudao-mall-uniapp-master/pages/user/PrizesWon.vue
new file mode 100644
index 0000000..2f3cd5a
--- /dev/null
+++ b/yudao-mall-uniapp-master/pages/user/PrizesWon.vue
@@ -0,0 +1,186 @@
+
+
+
+
+
+
+
+
+
+
+ 奖品名称:{{ item.name }}
+
+
+ 获得时间:{{ formattedDateTime(item.createTime) }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yudao-mall-uniapp-master/pages/user/prize.vue b/yudao-mall-uniapp-master/pages/user/prize.vue
new file mode 100644
index 0000000..8b0b277
--- /dev/null
+++ b/yudao-mall-uniapp-master/pages/user/prize.vue
@@ -0,0 +1,421 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击
+ 抽奖
+
+
+
+
+
+
+ 已获奖品
+ 活动规则
+
+
+
+
+
+
+
+
diff --git a/yudao-mall-uniapp-master/sheep/api/prize/index.js b/yudao-mall-uniapp-master/sheep/api/prize/index.js
new file mode 100644
index 0000000..6210c2c
--- /dev/null
+++ b/yudao-mall-uniapp-master/sheep/api/prize/index.js
@@ -0,0 +1,43 @@
+import request from '@/sheep/request';
+
+const PayOrderApi = {
+
+ // 开始抽奖
+ lottery: (id) => {
+ return request({
+ url: '/promotion/prize-draw/lottery',
+ method: 'GET',
+ params: { activityId: id },
+ });
+ },
+ // 已获奖品
+ PrizesWon: (id) => {
+ return request({
+ url: '/promotion/prize-draw/getMyPrizeLogDO',
+ method: 'GET',
+ params: { activityId: id },
+ });
+ },
+
+
+
+
+// 获得抽奖照片
+ prizeImg: (id) => {
+ return request({
+ url: '/promotion/prize-draw/activity-prize/list-by-activity-id',
+ method: 'GET',
+ params: { activityId:id },
+ });
+ },
+ // 规则
+ ActivityRules: (params) => {
+ return request({
+ url: '/promotion/prize-draw/getOne',
+ method: 'GET',
+ params,
+ });
+ },
+};
+
+export default PayOrderApi;
diff --git a/yudao-mall-uniapp-master/sheep/platform/share.js b/yudao-mall-uniapp-master/sheep/platform/share.js
index d7b638e..d693804 100644
--- a/yudao-mall-uniapp-master/sheep/platform/share.js
+++ b/yudao-mall-uniapp-master/sheep/platform/share.js
@@ -68,7 +68,6 @@ const getShareInfo = (
// 构造spm分享参数
const buildSpmQuery = (params) => {
const user = $store('user');
- console.log(user, 'user123');
let shareId = '0'; // 设置分享者用户ID
if (typeof params.shareId === 'undefined') {
if (user.isLogin) {