diff --git a/.env b/.env
index d6a7aaa..e59c517 100644
--- a/.env
+++ b/.env
@@ -3,10 +3,11 @@ SHOPRO_VERSION = v1.8.3
# 后端接口 - 正式环境（通过 process.env.NODE_ENV 非 development）
SHOPRO_BASE_URL = https://zysc.fjptzykj.com
+#SHOPRO_BASE_URL = http://192.168.1.20:6127
# 后端接口 - 测试环境（通过 process.env.NODE_ENV = development）
SHOPRO_DEV_BASE_URL = https://zysc.fjptzykj.com
-### SHOPRO_DEV_BASE_URL = http://yunai.natapp1.cc
+#SHOPRO_DEV_BASE_URL = http://192.168.1.20:6127
# 后端接口前缀（一般不建议调整）
SHOPRO_API_PATH = /app-api
diff --git a/pages.json b/pages.json
index 50d55d1..fdc3184 100644
--- a/pages.json
+++ b/pages.json
@@ -20,6 +20,32 @@
"group": "商城"
}
},
+ {
+ "path": "pages/integration/index",
+ "style": {
+ "navigationBarTitleText": "积分商城",
+ "enablePullDownRefresh": true
+ },
+ "meta": {
+ "auth": false,
+ "sync": true,
+ "title": "积分商城",
+ "group": "商城"
+ }
+ },
+ {
+ "path": "pages/subscribe/subscribe",
+ "style": {
+ "navigationBarTitleText": "预约",
+ "enablePullDownRefresh": true
+ },
+ "meta": {
+ "auth": false,
+ "sync": true,
+ "title": "预约",
+ "group": "商城"
+ }
+ },
{
"path": "pages/index/user",
"style": {
@@ -120,11 +146,10 @@
}
},
{
- "path" : "pages/mulu/mulu",
- "style" :
- {
- "navigationBarTitleText" : "详情",
- "enablePullDownRefresh" : true,
+ "path": "pages/mulu/mulu",
+ "style": {
+ "navigationBarTitleText": "详情",
+ "enablePullDownRefresh": true,
"navigationStyle": "default"
}
}
@@ -165,6 +190,28 @@
"group": "商品"
}
},
+ {
+ "path": "point",
+ "style": {
+ "navigationBarTitleText": "积分商品"
+ },
+ "meta": {
+ "sync": true,
+ "title": "积分商品",
+ "group": "商品"
+ }
+ },
+ {
+ "path": "sales",
+ "style": {
+ "navigationBarTitleText": "促销商品"
+ },
+ "meta": {
+ "sync": true,
+ "title": "促销商品",
+ "group": "商品"
+ }
+ },
{
"path": "list",
"style": {
@@ -238,16 +285,16 @@
"title": "申请售后"
}
},
- {
- "path": "aftersale/return-delivery",
- "style": {
- "navigationBarTitleText": "退货物流"
- },
- "meta": {
- "auth": true,
- "title": "退货物流"
- }
- },
+ {
+ "path": "aftersale/return-delivery",
+ "style": {
+ "navigationBarTitleText": "退货物流"
+ },
+ "meta": {
+ "auth": true,
+ "title": "退货物流"
+ }
+ },
{
"path": "aftersale/list",
"style": {
@@ -306,6 +353,18 @@
"group": "用户中心"
}
},
+ {
+ "path": "user_vip/index",
+ "style": {
+ "navigationBarTitleText": "会员中心"
+ },
+ "meta": {
+ "auth": true,
+ "sync": true,
+ "title": "会员中心",
+ "group": "用户中心"
+ }
+ },
{
"path": "goods-collect",
"style": {
@@ -352,6 +411,16 @@
"title": "编辑地址"
}
},
+ {
+ "path": "goods_details_store/index",
+ "style": {
+ "navigationBarTitleText": "门店管理"
+ },
+ "meta": {
+ "auth": true,
+ "title": "门店管理"
+ }
+ },
{
"path": "wallet/money",
"style": {
@@ -462,17 +531,17 @@
"group": "分销商城"
}
}, {
- "path": "withdraw",
- "style": {
- "navigationBarTitleText": "申请提现"
- },
- "meta": {
- "auth": true,
- "sync": true,
- "title": "申请提现",
- "group": "分销商城"
- }
- }
+ "path": "withdraw",
+ "style": {
+ "navigationBarTitleText": "申请提现"
+ },
+ "meta": {
+ "auth": true,
+ "sync": true,
+ "title": "申请提现",
+ "group": "分销商城"
+ }
+ }
]
},
{
@@ -697,4 +766,4 @@
}
]
}
-}
+}
\ No newline at end of file
diff --git a/pages/activity/groupon/detail.vue b/pages/activity/groupon/detail.vue
index 0cf22f1..bade0a3 100644
--- a/pages/activity/groupon/detail.vue
+++ b/pages/activity/groupon/detail.vue
@@ -1,516 +1,531 @@
-
-
-
-
-
+
+
+
+
+
-
+
-
-
- {{ state.data.headRecord.userSize }}人团
- 已拼{{ state.data.headRecord.userCount }}件
-
-
-
-
+ " :style="[{ top: Number(statusBarHeight + 108) + 'rpx' }]">
+
+
+ {{ state.data.headRecord.userSize }}人团
+ 已拼{{ state.data.headRecord.userCount }}件
+
+
+
+
+
+
+
+
+
+
+
+ 恭喜您~拼团成功
+
+
+
+
+
+ 抱歉~该团已满员
+
+
+
-
-
-
-
-
-
- 恭喜您~拼团成功
-
-
-
-
-
- 抱歉~该团已满员
-
-
-
+
+
+
+
+ {{ state.data.orderId ? '拼团超时,已自动退款' : '该团已解散' }}
+
+
-
-
-
-
- {{ state.data.orderId ? '拼团超时,已自动退款' : '该团已解散' }}
-
-
+
+
+
+
+
+ 拼团已结束,请关注下次活动
+
+
+
+ 还差
+ {{ state.data.headRecord.userSize - state.data.headRecord.userCount }}人
+ 拼团成功
+
+ {{ endTime.h }}
+ :
+
+ {{ endTime.m }}
+
+ :
+
+ {{ endTime.s }}
+
+
+
+
-
-
-
-
-
- 拼团已结束,请关注下次活动
-
-
-
- 还差
- {{ state.data.headRecord.userSize - state.data.headRecord.userCount }}人
- 拼团成功
-
- {{ endTime.h }}
- :
-
- {{ endTime.m }}
-
- :
-
- {{ endTime.s }}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+ .order-btn {
+ width: 668rpx;
+ height: 70rpx;
+ border: 2rpx solid #dfdfdf;
+ border-radius: 35rpx;
+ color: #999999;
+ font-weight: 500;
+ font-size: 26rpx;
+ line-height: normal;
+ }
+
+ .disabled-btn {
+ width: 668rpx;
+ height: 70rpx;
+ background: #dddddd;
+ border-radius: 35rpx;
+ color: #999999;
+ font-weight: 500;
+ font-size: 28rpx;
+ line-height: normal;
+ }
+
+ .join-btn {
+ width: 668rpx;
+ height: 70rpx;
+ background: linear-gradient(90deg, #ff6000 0%, #fe832a 100%);
+ box-shadow: 0px 8rpx 6rpx 0px rgba(255, 104, 4, 0.22);
+ border-radius: 35rpx;
+ color: #fff;
+ font-weight: 500;
+ font-size: 28rpx;
+ line-height: normal;
+ }
+
+ .detail-cell-wrap {
+ width: 100%;
+ padding: 10rpx 20rpx;
+ box-sizing: border-box;
+ border-top: 2rpx solid #dfdfdf;
+ background-color: #fff;
+ // min-height: 60rpx;
+
+ .label-text {
+ font-size: 28rpx;
+ font-weight: 400;
+ }
+
+ .cell-content {
+ font-size: 28rpx;
+ font-weight: 500;
+ color: $dark-6;
+ }
+
+ .right-forwrad-icon {
+ font-size: 28rpx;
+ font-weight: 500;
+ color: $dark-9;
+ }
+ }
+
\ No newline at end of file
diff --git a/pages/activity/groupon/list.vue b/pages/activity/groupon/list.vue
index b5a2746..416c85b 100644
--- a/pages/activity/groupon/list.vue
+++ b/pages/activity/groupon/list.vue
@@ -119,7 +119,7 @@
width: 100%;
height: 458rpx;
margin-top: -88rpx;
- background: v-bind(headerBg) no-repeat;
+ background: url('https://zysc.fjptzykj.com:3000/shangcheng/fea9ad54f32d4705a633874efd534e70e507030ea5a7604b0110fdf7292f1f4d.png');
background-size: 100% 100%;
}
.list-content {
@@ -203,9 +203,11 @@
}
}
.scroll-box {
+ margin-top: 13px;
height: 900rpx;
.goods-box {
position: relative;
+ padding: 0 10px;
.cart-btn {
position: absolute;
bottom: 10rpx;
diff --git a/pages/activity/point/list.vue b/pages/activity/point/list.vue
new file mode 100644
index 0000000..129f988
--- /dev/null
+++ b/pages/activity/point/list.vue
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/commission/components/commission-auth.vue b/pages/commission/components/commission-auth.vue
index 9a484fa..1b348fe 100644
--- a/pages/commission/components/commission-auth.vue
+++ b/pages/commission/components/commission-auth.vue
@@ -12,7 +12,7 @@
diff --git a/pages/commission/components/commission-info.vue b/pages/commission/components/commission-info.vue
index 1bd5fb4..25285aa 100644
--- a/pages/commission/components/commission-info.vue
+++ b/pages/commission/components/commission-info.vue
@@ -34,7 +34,7 @@
height: 192rpx;
margin: -88rpx 20rpx 0 20rpx;
padding-top: 88rpx;
- background: v-bind(headerBg) no-repeat;
+ background: url('https://zysc.fjptzykj.com:3000/shangcheng/10c7d7a9afb36266f658e5f398922b835530cb350ef98cf90d4ef6f60ccc1bc1.png') no-repeat;
background-size: 100% 100%;
.head-img-box {
diff --git a/pages/commission/components/commission-log.vue b/pages/commission/components/commission-log.vue
index b0fa56c..d6a8201 100644
--- a/pages/commission/components/commission-log.vue
+++ b/pages/commission/components/commission-log.vue
@@ -2,7 +2,7 @@
+ .mobile-title {
+ font-size: 24rpx;
+ font-weight: 500;
+ color: #ff690d;
+ }
+
+ .bind-btn {
+ width: 100rpx;
+ height: 50rpx;
+ background: #ff6100;
+ border-radius: 25rpx;
+ font-size: 24rpx;
+ font-weight: 500;
+ color: #ffffff;
+ }
+ }
+
\ No newline at end of file
diff --git a/sheep/components/s-wallet-card/s-wallet-card.vue b/sheep/components/s-wallet-card/s-wallet-card.vue
index 1ecb6d0..683914a 100644
--- a/sheep/components/s-wallet-card/s-wallet-card.vue
+++ b/sheep/components/s-wallet-card/s-wallet-card.vue
@@ -7,20 +7,13 @@
>
{{ fen2yuan(userWallet.balance) || '0.00' }}
- 元
+
+
+
-
-
-
+
-
+
@@ -75,7 +82,7 @@
.menu-title {
font-size: 24rpx;
line-height: 24rpx;
- color: #333333;
+ color: white;
}
.item-icon {
@@ -88,8 +95,9 @@
text-align: center;
.value-text {
- font-size: 28rpx;
- color: #000000;
+ font-size: 30rpx;
+ font-weight: 600;
+ color: white;
line-height: 28rpx;
vertical-align: text-bottom;
font-family: OPPOSANS;
@@ -97,7 +105,7 @@
.unit-text {
font-size: 24rpx;
- color: #343434;
+ color: white;
line-height: 24rpx;
}
}
diff --git a/sheep/platform/provider/wechat/miniProgram.js b/sheep/platform/provider/wechat/miniProgram.js
index e31408c..6d8d91c 100644
--- a/sheep/platform/provider/wechat/miniProgram.js
+++ b/sheep/platform/provider/wechat/miniProgram.js
@@ -164,10 +164,10 @@ const checkUpdate = async (silence = true) => {
// 获取订阅消息模板
async function getSubscribeTemplate() {
- const { error, data } = await third.wechat.subscribeTemplate();
- if (error === 0) {
- subscribeEventList = data;
- }
+ // const { error, data } = await third.wechat.subscribeTemplate();
+ // if (error === 0) {
+ // subscribeEventList = data;
+ // }
}
// 订阅消息
diff --git a/sheep/ui/su-coupon/su-coupon.vue b/sheep/ui/su-coupon/su-coupon.vue
index 472d17f..4d6c84e 100644
--- a/sheep/ui/su-coupon/su-coupon.vue
+++ b/sheep/ui/su-coupon/su-coupon.vue
@@ -1,7 +1,7 @@
- {{ state.stateMap[props.state] }}
-
+ -->
-
-
+ -->
-
仅剩：{{ props.surplus }}张
-
+ -->
+
+
+
+
+ {{type === 'reduce' ?'￥':''}}{{ type === 'reduce' ? Number(value) : Number(value/10) }}
+ {{ type === 'reduce' ? ' ' : '折' }}
+
+
+ {{ props.title }}
+ 仅剩：{{ props.surplus }}张
+
+
+
+
+
+
+
+
@@ -175,6 +206,7 @@
\ No newline at end of file
diff --git a/uni_modules/zmxy-slideshow/package.json b/uni_modules/zmxy-slideshow/package.json
new file mode 100644
index 0000000..85db18b
--- /dev/null
+++ b/uni_modules/zmxy-slideshow/package.json
@@ -0,0 +1,85 @@
+{
+ "id": "zmxy-slideshow",
+ "displayName": "zmxy-slideshow-个性化幻灯片",
+ "version": "1.0.3",
+ "description": "zmxy-slideshow-个性化幻灯片，常用于轮播图，广告播放",
+ "keywords": [
+ "幻灯片",
+ "轮播图",
+ "广告横幅",
+ "渐变",
+ "放大"
+],
+ "repository": "",
+ "engines": {
+ "HBuilderX": "^3.8.0"
+ },
+ "dcloudext": {
+ "type": "component-vue",
+ "sale": {
+ "regular": {
+ "price": "0.00"
+ },
+ "sourcecode": {
+ "price": "0.00"
+ }
+ },
+ "contact": {
+ "qq": ""
+ },
+ "declaration": {
+ "ads": "无",
+ "data": "无",
+ "permissions": "无"
+ },
+ "npmurl": ""
+ },
+ "uni_modules": {
+ "dependencies": [],
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "y",
+ "aliyun": "y"
+ },
+ "client": {
+ "Vue": {
+ "vue2": "y",
+ "vue3": "y"
+ },
+ "App": {
+ "app-vue": "y",
+ "app-nvue": "n"
+ },
+ "H5-mobile": {
+ "Safari": "y",
+ "Android Browser": "y",
+ "微信浏览器(Android)": "y",
+ "QQ浏览器(Android)": "y"
+ },
+ "H5-pc": {
+ "Chrome": "y",
+ "IE": "y",
+ "Edge": "y",
+ "Firefox": "y",
+ "Safari": "y"
+ },
+ "小程序": {
+ "微信": "y",
+ "阿里": "y",
+ "百度": "y",
+ "字节跳动": "n",
+ "QQ": "y",
+ "钉钉": "y",
+ "快手": "y",
+ "飞书": "n",
+ "京东": "n"
+ },
+ "快应用": {
+ "华为": "u",
+ "联盟": "u"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/zmxy-slideshow/readme.md b/uni_modules/zmxy-slideshow/readme.md
new file mode 100644
index 0000000..21ee561
--- /dev/null
+++ b/uni_modules/zmxy-slideshow/readme.md
@@ -0,0 +1,65 @@
+# zmxy-slideshow 幻灯片
+
+> 该组件是对原生
+> [swiper](https://uniapp.dcloud.net.cn/component/swiper.html)
+> 进行封装，继承了原组件部分属性及功能。
+
+## 属性说明
+
+| 属性名 | 类型 | 默认值 | 说明 | 平台差异说明 |
+|:-------------------:|:-----------:|:--------:|:----------------------------------------------------------------------------------------------------:|:------------------------------------------------:|
+| autoplay | Boolean | true | 是否自动切换 | |
+| interval | Number | 5000 | 自动切换时间间隔 | |
+| vertical | Boolean | false | 滑动方向是否为纵向 | |
+| margin | String | 60rpx | 前后边距，接受 px 和 rpx 值 | app-nvue、抖音小程序、飞书小程序不支持 |
+| easing-function | String | default | 指定 swiper 切换缓动动画类型，有效值：default、linear、easeInCubic、easeOutCubic、easeInOutCubic | 微信小程序、快手小程序、京东小程序 |
+| height | String | 300rpx | 组件整体高度，接受 px 和 rpx 值 | |
+| items | Array | [] | 图片地址、标题、链接等数据组成的对象数组（[{url,title,link,...},{url,title,link,...},...]），也支持字符串数组（[url1,url2,url3,...]） | |
+| @clickItem | EventHandle | | 点击幻灯片触发 clickItem 事件，item = {url,title,link,...} 或者 item = url |
+
+### easing-function 属性
+
+| 值 | 说明 |
+|:---------------:|:-------:|
+| default | 默认缓动函数 |
+| linear | 线性动画 |
+| easeInCubic | 缓入动画 |
+| easeOutCubic | 缓出动画 |
+| easeInOutCubic | 缓入缓出动画 |
+
+### 案例代码
+
+```vue
+# 基础使用
+
+# 字符串数组，线性动画
+
+```
+```javascript
+export default {
+ data() {
+ return {
+ items: [{
+ url: 'https://web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg',
+ title: '内容标题',
+ }, {
+ url: 'https://web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg',
+ title: '内容标题',
+ }, {
+ url: 'https://web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg',
+ title: '内容标题',
+ }, ],
+ items2: [
+ 'https://web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg',
+ 'https://web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg',
+ 'https://web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg',
+ ],
+ };
+ },
+ methods: {
+ clickItem(item) {
+ console.log(item);
+ }
+ }
+}
+```
+ 
+ 拼团活动
+ 
+ 限时秒杀
+