From 20d994a8b07c0149f9f9db99bc2a63c2027a3490 Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Wed, 29 May 2024 15:46:29 +0800
Subject: [PATCH] 1
---
App.vue | 12 +-
androidPrivacy.json | 4 +-
api/user.js | 14 +
components/PriceChange/index.vue | 3 +-
components/blindBox/blindBox.vue | 41 +-
components/jyf-parser/jyf-parser.vue | 11 +-
components/jyf-parser/libs/trees.vue | 7 +-
components/payment/index.vue | 23 +-
components/productWindow/index.vue | 7 +-
components/treasureBox/index.vue | 23 +-
config/app.js | 8 +-
main.js | 2 -
manifest.json | 6 +-
pages.json | 6 +
pages/activity/rank/index.vue | 14 +-
pages/admin/orderDetail/index.vue | 4 +-
pages/admin/orderList/index.vue | 4 +-
pages/columnGoods/HotNewGoods/index.vue | 6 +-
pages/columnGoods/goods_search_con/index.vue | 14 +-
pages/goods_details/index.vue | 27 +-
pages/index/index.vue | 14 +-
pages/order_addcart/order_addcart.vue | 4 +-
pages/order_details/index.vue | 28 +-
pages/order_details/stay.vue | 22 +-
pages/order_pay_back/index.vue | 4 +-
pages/users/order_confirm/index.vue | 28 +-
pages/users/order_list/index.vue | 16 +-
pages/users/refund/confirm.vue | 8 +-
pages/users/user_about/index.vue | 8 +-
pages/users/user_address/index.vue | 32 +-
pages/users/user_info_form/index.vue | 195 ++--
pages/users/user_sgin/index.vue | 124 ++-
pages/users/winning_confirm/index.vue | 974 +++++++++++++++++++
static/images/1353901.png | Bin 6902387 -> 0 bytes
static/images/gagag.jpg | Bin 94590 -> 0 bytes
static/images/img_2.JPG | Bin 402292 -> 0 bytes
static/images/img_3.JPG | Bin 523086 -> 0 bytes
static/images/img_4.JPG | Bin 1909982 -> 0 bytes
static/images/img_5.JPG | Bin 254098 -> 0 bytes
static/images/prize.png | Bin 0 -> 88041 bytes
static/images/wallhaven-vqv3ml.jpg | Bin 6533037 -> 0 bytes
utils/util.js | 7 +-
42 files changed, 1480 insertions(+), 220 deletions(-)
create mode 100644 pages/users/winning_confirm/index.vue
delete mode 100644 static/images/1353901.png
delete mode 100644 static/images/gagag.jpg
delete mode 100644 static/images/img_2.JPG
delete mode 100644 static/images/img_3.JPG
delete mode 100644 static/images/img_4.JPG
delete mode 100644 static/images/img_5.JPG
create mode 100644 static/images/prize.png
delete mode 100644 static/images/wallhaven-vqv3ml.jpg
diff --git a/App.vue b/App.vue
index b76125b..4ea2351 100644
--- a/App.vue
+++ b/App.vue
@@ -118,9 +118,9 @@
if (this.$store.state.app.token) {
// 浏览记录
// #ifdef H5
- history({
- page: location.pathname + location.search,
- }).then(() => {});
+ // history({
+ // page: location.pathname + location.search,
+ // }).then(() => {});
//#endif
};
// #ifndef H5
@@ -232,9 +232,9 @@
$route(n) {
if (this.$store.state.app.token) {
// 浏览记录
- history({
- page: location.pathname + location.search,
- }).then(() => {});
+ // history({
+ // page: location.pathname + location.search,
+ // }).then(() => {});
}
},
}
diff --git a/androidPrivacy.json b/androidPrivacy.json
index dc05560..4075d05 100644
--- a/androidPrivacy.json
+++ b/androidPrivacy.json
@@ -3,12 +3,12 @@
"prompt" : "template",
"title" : "服务协议与隐私政策",
"message" : "\t请务必审慎阅读、充分理解“服务协议与 隐私政策”各条款，包括但不限于：为了 向你提供即时通讯、内容分享等服务，我 们需要收集你的设备信息、操作日志等个 人信息。你可以在“设置”中查看、变更、删除个人信息并管理你的授权。
\r\r\r
-\t你可以阅读 《用户协议》 与 《隐私政策》了解详细信息。如你同意，请点击“我同意”开始接受我们的服务。",
+\t你可以阅读 《用户协议》 与 《隐私政策》了解详细信息。如你同意，请点击“我同意”开始接受我们的服务。",
"buttonAccept" : "同意并接受",
"buttonRefuse" : "暂不同意",
"second" : {
"title" : "确认提示",
- "message" : "进入应用前，你需先同意《用户协议》 与 《隐私政策》，否则将退出应用。",
+ "message" : "进入应用前，你需先同意《用户协议》 与 《隐私政策》，否则将退出应用。",
"buttonAccept" : "同意并继续",
"buttonRefuse" : "退出应用"
},
diff --git a/api/user.js b/api/user.js
index 17692cc..df750ac 100644
--- a/api/user.js
+++ b/api/user.js
@@ -420,6 +420,12 @@ export function feedback(data) {
export function feedbackList(data) {
return request.get("user/feedback/list", data);
}
+/**
+ * 中奖列表
+ */
+export function signEntityLog() {
+ return request.get("user/sign/entity_log");
+}
/**
* 反馈列表
*/
@@ -607,6 +613,14 @@ export function cacheInfo(key) {
export function userOut(data) {
return request.post(`user/cancel`, data)
}
+/**
+ * 地址
+ * @param object data
+ *
+ */
+export function signAddress(data) {
+ return request.post(`user/sign/address`, data)
+}
/**
* 获取聊天用户信息
* @param object data
diff --git a/components/PriceChange/index.vue b/components/PriceChange/index.vue
index f65e2d1..ed264d1 100644
--- a/components/PriceChange/index.vue
+++ b/components/PriceChange/index.vue
@@ -2,7 +2,8 @@
- {{ status == 0 ? "一键改价" : status == 1 ? "订单备注" : "立即退款" }}
+ {{ status == 1 ? "订单备注" : "立即退款" }}
+
diff --git a/components/blindBox/blindBox.vue b/components/blindBox/blindBox.vue
index 019706b..308722e 100644
--- a/components/blindBox/blindBox.vue
+++ b/components/blindBox/blindBox.vue
@@ -18,18 +18,24 @@
@@ -109,6 +107,7 @@
});
},
goPay: function(number, paytype,password) {
+ console.log(paytype)
this.number=number;
if (this.isCall) {
return this.$emit('onChangeFun', {
@@ -141,6 +140,10 @@
// #ifdef MP
type = 'alipayQr';
// #endif
+ }else if(paytype == 'sand'){
+ type = 'sand'
+ }else if(paytype == 'sandCard'){
+ type = 'sandCard'
}
if (!that.order_id) return that.$util.Tips({
title: '请选择要支付的订单'
@@ -376,9 +379,25 @@
location.href = locations;
}, 100);
break;
+ case 'sand':
+ case 'sandCard':
+ setTimeout(() => {
+ location.href = jsConfig;
+ }, 100);
+ break;
// #endif
// #ifdef APP-PLUS
+ case 'sand':
+ case 'sandCard':
+ console.log(jsConfig);
+ if (plus.os.name === 'iOS') {
+ plus.runtime.openURL(jsConfig);
+ } else if (plus.os.name === 'Android') {
+ console.log(jsConfig);
+ plus.runtime.openURL(jsConfig);
+ }
+ break;
case 'alipayApp':
uni.requestPayment({
provider: 'alipay',
diff --git a/components/productWindow/index.vue b/components/productWindow/index.vue
index d7ceab0..2cfd08c 100644
--- a/components/productWindow/index.vue
+++ b/components/productWindow/index.vue
@@ -13,7 +13,7 @@
预售价
￥{{ attr.productSelect.price }}
-
+
可用抵扣
{{attr.productSelect.coupon}}券
@@ -34,7 +34,7 @@
￥{{ attr.productSelect.price }}
-
+
可用抵扣
{{attr.productSelect.coupon}}券
@@ -167,7 +167,7 @@
value: ''
}
},
- computed: mapGetters(['viewColor']),
+ computed: mapGetters(['viewColor','globalData']),
data() {
return {
};
@@ -227,6 +227,7 @@
//获取被选中属性；
getCheckedValue: function() {
let productAttr = this.attr.productAttr;
+ console.log(this.attr.productAttr);
let value = [];
for (let i = 0; i < productAttr.length; i++) {
for (let j = 0; j < productAttr[i].attr_values.length; j++) {
diff --git a/components/treasureBox/index.vue b/components/treasureBox/index.vue
index 84bf270..3ac99f6 100644
--- a/components/treasureBox/index.vue
+++ b/components/treasureBox/index.vue
@@ -2,7 +2,7 @@
-
+
@@ -28,12 +28,12 @@
- 很遗憾,差一点就中奖了
+ 谢谢参与
期待您下次再来
我知道了
继续开盲盒
-
+
@@ -72,8 +72,8 @@
this.blind=false;
this.close();
},
- async openBox(){
- await setSignIntegral().then(res=>{
+ openBox(){ ;
+ setSignIntegral().then(res=>{
this.drawInfo.text = res.data.integral;
this.drawInfo.wheel=res.data.wheel;
this.gifShow=true;
@@ -84,12 +84,13 @@
},1500)
}).catch(err=>{
// this.close();
- // return this.$util.Tips({title:err})
+ return this.$util.Tips({title:err})
});
},
goBlind(){
this.blindShow=true;
+ this.popShow=false;
},
close(){
this.$emit('closeTreasureBox')
@@ -104,11 +105,11 @@
height: 100vh;
position: fixed;
top: 0;
- z-index: 1000;
+ z-index: 996;
padding-top: 200rpx;
background-color: rgba(0,0,0,1);
.coupon_popups{
- z-index: 999;
+ z-index: 997;
position: fixed;
left: 0;
top: 0;
@@ -127,7 +128,7 @@
.con{
position: absolute;
left: 50%;
- top: 50%;
+ top: 48%;
transform: translate(-50%,-50%);
width: 680rpx;
height: 900rpx;
@@ -219,8 +220,8 @@
.top{
width: 488rpx;
height: 140rpx;
- background-image: url('https://store.tropjoin.com/images/box-title.png');
- background-size: 100% 100%;
+ // background-image: url('https://store.tropjoin.com/images/box-title.png');
+ // background-size: 100% 100%;
margin: 0 auto;
}
.lucky-draw{
diff --git a/config/app.js b/config/app.js
index 0b23215..9622ad1 100644
--- a/config/app.js
+++ b/config/app.js
@@ -6,12 +6,12 @@ let VUE_APP_WS_URL = `ws://${location.hostname}?type=user`
let openPlantGrass = '-openPlantGrass-'
// 网络接口修改此字符 小程序域名要求https
-let httpApi = 'http://192.168.1.107:8080' //测试
-// let httpApi = 'https://api.tropjoin.com' //生产
+// let httpApi = 'http://192.168.1.50:8080' //测试
+let httpApi = 'https://api.tropjoin.com' //生产
// 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer. .net
-let wsApi = 'ws://192.168.1.107:8080'
-// let wsApi = 'wss://ws.tropjoin.com'
+// let wsApi = 'ws://192.168.1.50:8080'
+let wsApi = 'wss://ws.tropjoin.com'
module.exports = {
// 请求域名 格式： https://您的域名
diff --git a/main.js b/main.js
index d4987fe..d62bf84 100644
--- a/main.js
+++ b/main.js
@@ -4,7 +4,6 @@ import App from './App'
import store from './store'
import Cache from './utils/cache'
import util from 'utils/util'
-import fq from 'utils/fq'
import { HTTP_REQUEST_URL } from '@/config/app';
import skeleton from './components/skeleton/index.vue'
import BaseMoney from './components/BaseMoney.vue';
@@ -13,7 +12,6 @@ Vue.component('skeleton', skeleton)
Vue.component('BaseMoney', BaseMoney)
Vue.prototype.$util = util;
Vue.prototype.$Cache = Cache;
-Vue.prototype.$fq = fq;
Vue.prototype.$eventHub = new Vue();
Vue.config.productionTip = false
// Vue.use(uvUI);
diff --git a/manifest.json b/manifest.json
index 53d5bf9..88e0d8f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,9 +1,9 @@
{
- "name" : "铸源商城",
+ "name" : "铸源优品",
"appid" : "__UNI__496DF55",
"description" : "",
- "versionName" : "1.0.3",
- "versionCode" : 130,
+ "versionName" : "1.0.6",
+ "versionCode" : 133,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages.json b/pages.json
index e7329d7..c95425d 100644
--- a/pages.json
+++ b/pages.json
@@ -381,6 +381,12 @@
"style": {
"navigationBarTitleText": "提交订单"
}
+ },
+ {
+ "path": "winning_confirm/index",
+ "style": {
+ "navigationBarTitleText": "奖品记录"
+ }
},
{
"path": "promoter-list/index",
diff --git a/pages/activity/rank/index.vue b/pages/activity/rank/index.vue
index 936c41a..1ff8cf8 100644
--- a/pages/activity/rank/index.vue
+++ b/pages/activity/rank/index.vue
@@ -110,7 +110,7 @@
// 获取设备宽度
uni.getSystemInfo({
success(e) {
- that.isWidth = e.windowWidth / 6;
+ // that.isWidth = e.windowWidth / 6;
that.windowHeight = e.windowHeight;
// that.swiperHeight = that.windowHeight - 205
that.$set(that, 'swiperHeight', that.windowHeight-150);
@@ -126,13 +126,19 @@
methods: {
spuTop(cate_id) {
spuTop().then(res => {
+ console.log(cate_id);
+
this.categoryList = [...this.categoryList, ...res.data]
this.cate_name = this.getCate(cate_id,this.categoryList) || ''
+ this.getSpuTopList(cate_id)
this.$nextTick(() => {
- this.getSpuTopList(cate_id)
- this.active = cate_id && this.cate_name ? cate_id : 0
+ console.log('xxx');
+ // this.getSpuTopList(cate_id)
+ // this.active = cate_id && this.cate_name ? cate_id : 0
+ this.active = 0
this.scrollInto = `cate${cate_id}`;
let tabLeft = (this.swiperCur - 2) * this.isWidth; //设置下划线位置
+ console.log(tabLeft);
this.$set(this, 'tabLeft', tabLeft);
});
})
@@ -142,7 +148,9 @@
spuTopList({
cate_pid: cate_id
}).then(res => {
+ console.log(res);
this.spuTopList = (res.data[0] && res.data[0]['list']) || []
+ console.log(this.spuTopList);
})
},
swiperChange(e) {
diff --git a/pages/admin/orderDetail/index.vue b/pages/admin/orderDetail/index.vue
index caf97b6..da95cb4 100644
--- a/pages/admin/orderDetail/index.vue
+++ b/pages/admin/orderDetail/index.vue
@@ -155,9 +155,9 @@