diff --git a/app.js b/app.js
index e3aadd6..b8acb85 100644
--- a/app.js
+++ b/app.js
@@ -45,6 +45,7 @@ App({
if(options.query.shared_user_code){
this.globalData.shared_user_code = options.query.shared_user_code;
}
+ this.checkUpdate();
},
navToLogin(){
wx.reLaunch({
@@ -181,5 +182,27 @@ App({
},
getAddressList(){
+ },
+ checkUpdate() {
+ if (!wx.canIUse('getUpdateManager')) {
+ return;
+ }
+ const updateManager = wx.getUpdateManager();
+
+ updateManager.onCheckForUpdate((res) => {
+ console.log(res);
+ });
+ updateManager.onUpdateReady(() => {
+ wx.showModal({
+ title: '更新提示',
+ content: '新版本已准备好，重启应用以使用新版本',
+ showCancel: false,
+ success: (res) => {
+ if (res.confirm) {
+ updateManager.applyUpdate();
+ }
+ }
+ });
+ });
}
})
diff --git a/app.json b/app.json
index 143f44c..13541c2 100644
--- a/app.json
+++ b/app.json
@@ -25,7 +25,8 @@
"pages/my/setting/name/index",
"pages/browser/index",
"pages/my/promation/wx-group/index",
- "pages/order/markup/index"
+ "pages/order/markup/index",
+ "pages/my/promation/share/index"
],
"window": {
"navigationBarTextStyle": "black",
diff --git a/assets/icon/my/logo.png b/assets/icon/my/logo.png
new file mode 100644
index 0000000..2c6ee82
Binary files /dev/null and b/assets/icon/my/logo.png differ
diff --git a/assets/imgs/share/icon1.png b/assets/imgs/share/icon1.png
new file mode 100644
index 0000000..830ca64
Binary files /dev/null and b/assets/imgs/share/icon1.png differ
diff --git a/assets/imgs/share/icon2.png b/assets/imgs/share/icon2.png
new file mode 100644
index 0000000..076fe8c
Binary files /dev/null and b/assets/imgs/share/icon2.png differ
diff --git a/assets/imgs/share/icon3.png b/assets/imgs/share/icon3.png
new file mode 100644
index 0000000..caffebf
Binary files /dev/null and b/assets/imgs/share/icon3.png differ
diff --git a/assets/imgs/share/icon4.png b/assets/imgs/share/icon4.png
new file mode 100644
index 0000000..cb592c3
Binary files /dev/null and b/assets/imgs/share/icon4.png differ
diff --git a/assets/imgs/share/share-title.png b/assets/imgs/share/share-title.png
new file mode 100644
index 0000000..4a76aa3
Binary files /dev/null and b/assets/imgs/share/share-title.png differ
diff --git a/assets/imgs/share/share.png b/assets/imgs/share/share.png
new file mode 100644
index 0000000..b82a7eb
Binary files /dev/null and b/assets/imgs/share/share.png differ
diff --git a/pages/help/index/index.wxml b/pages/help/index/index.wxml
index 86bc512..654657b 100644
--- a/pages/help/index/index.wxml
+++ b/pages/help/index/index.wxml
@@ -82,11 +82,11 @@
{{appConfig.join_group_title}}
{{appConfig.join_group_desc}}
-
+
-
+
diff --git a/pages/my/promation/share/index.js b/pages/my/promation/share/index.js
new file mode 100644
index 0000000..a88ac89
--- /dev/null
+++ b/pages/my/promation/share/index.js
@@ -0,0 +1,66 @@
+// pages/my/promation/share/index.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/my/promation/share/index.json b/pages/my/promation/share/index.json
new file mode 100644
index 0000000..344b359
--- /dev/null
+++ b/pages/my/promation/share/index.json
@@ -0,0 +1,4 @@
+{
+ "usingComponents": {},
+ "navigationBarTitleText": "宠粉行动"
+}
\ No newline at end of file
diff --git a/pages/my/promation/share/index.wxml b/pages/my/promation/share/index.wxml
new file mode 100644
index 0000000..55bfc50
--- /dev/null
+++ b/pages/my/promation/share/index.wxml
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+ 奖励规则
+
+
+
+
+
+ 好友首单奖励
+
+ 好友注册并完成首单，您将获得奖励
+
+
+
+
+
+
+
+
+ 好友首单奖励
+
+ 好友每完成后续订单，您将获得奖励
+
+
+
+
+
+
+
+
+
+
+ 积分可用于抵扣配送费，
+
+
+
+
+
+
+
+
+
+ 积分长期有效，无需担心过期
+
+
+
+
+
+
+
+ 邀请步骤
+
+
+ 1
+ 分享给好友
+
+
+ 2
+ 好友下单完成
+
+
+ 3
+ 获得积分奖励
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/my/promation/share/index.wxss b/pages/my/promation/share/index.wxss
new file mode 100644
index 0000000..7f235aa
--- /dev/null
+++ b/pages/my/promation/share/index.wxss
@@ -0,0 +1,152 @@
+page{
+ background-color:var(--main-color);
+}
+.scroll-view{
+ height:100vh;
+}
+
+.logo-area{
+ background-color: rgba(237, 181, 0, 1);
+ border-radius: 50%;
+ width:132rpx;height:132rpx;
+ margin:70rpx auto 0 auto;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+.logo-area .logo{
+ width:84rpx;height:84rpx;
+}
+.share-title{
+ width:512rpx;
+ margin:36rpx auto 0 auto;
+ display: block;
+}
+
+.main{
+ background-color: #fff;
+ border-radius: 18rpx;
+ margin:40rpx 24rpx;
+ padding:40rpx 24rpx;
+ box-shadow: 0px 3px 6px 1px rgba(0, 0, 0, 0.1);
+}
+.main .head{
+ font-size: 36rpx;
+ display: flex;
+ gap: 24rpx;
+ align-items: center;
+ color: var(--main-color);
+}
+.main .head::before{
+ content: '';
+ background-color: var(--main-color);
+ border-radius: 18rpx;
+ width:8rpx;height:32rpx;
+}
+
+.main .m-item{
+ display: flex;
+ align-items: center;
+ margin:50rpx 0 60rpx 0;
+}
+.main .m-item.small{
+ margin:30rpx 0;
+}
+.main .m-item .left{
+ width:70rpx;height:70rpx;
+ background-color: rgba(255, 246, 217, 1);
+ border-radius: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+.main .m-item.small .left{
+ width:52rpx;height:52rpx;
+}
+.main .m-item .right{
+ margin-left:24rpx;
+ display: flex;
+ flex-direction: column;
+ gap: 20rpx;
+}
+.main .m-item .icon{
+ width:40rpx;height:40rpx;
+}
+.main .m-item .title{
+ font-weight: 500;
+}
+.main .m-item .sub-title{
+ font-size:26rpx;
+ color: rgba(85, 85, 85, 1);
+}
+.main .m-item .point{
+ color: var(--main-color);
+ font-weight: 600;
+ margin:0 12rpx;
+}
+
+.spliter{
+ position: relative;
+ margin:64rpx 0 60rpx 0;
+}
+.spliter::before{
+ content:'积分说明';
+ position: absolute;
+ top:-14rpx;left:50%;
+ margin-left: -78rpx;
+ padding:0 22rpx;
+ font-size: 28rpx;
+ background-color: #fff;
+}
+
+.btn-share{
+ border-radius: 60rpx;
+ margin:60rpx 70rpx 0 70rpx!important;
+ line-height: 1;
+}
+
+.step-area{
+ background-color: rgba(255, 246, 217, 1);
+ border-radius: 18rpx;
+ padding:30rpx 24rpx 34rpx 24rpx;
+ margin-top:60rpx;
+}
+.step-area .title{
+ color: var(--main-color);
+ text-align: center;
+}
+.step-area .steps{
+ display: flex;
+ font-size: 22rpx;
+ margin-top:34rpx;
+}
+.step-area .steps .item{
+ display: flex;
+ flex-direction: column;
+ gap: 30rpx;
+ flex: 1;
+ align-items: center;
+ position: relative;
+}
+.step-area .steps .icon{
+ width:60rpx;height:60rpx;
+ background-color: rgba(237, 181, 0, 1);
+ font-size: 36rpx;
+ font-weight: bold;
+ border-radius: 50%;
+ color: #fff;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+.step-area .steps .item::after{
+ background:transparent url(data:image/svg+xml,%3Csvg%20t%3D%221743574928938%22%20class%3D%22icon%22%20viewBox%3D%220%200%201024%201024%22%20version%3D%221.1%22%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20p-id%3D%2245741%22%20width%3D%22128%22%20height%3D%22128%22%3E%3Cpath%20d%3D%22M456.99072%20608.60416l-272.9984-28.73344a68.23936%2068.23936%200%200%201%200-135.74144l272.9984-28.73344A61.44%2061.44%200%200%200%20512%20354.28352v-132.15744C512%20201.23648%20529.73568%20184.32%20551.60832%20184.32c10.15808%200%2019.94752%203.72736%2027.32032%2010.4448L882.688%20470.91712a54.90688%2054.90688%200%200%201%200%2082.1248L578.92864%20829.25568a40.96%2040.96%200%200%201-56.0128-1.31072A36.90496%2036.90496%200%200%201%20512%20801.87392V669.696a61.44%2061.44%200%200%200-55.00928-61.11232z%22%20p-id%3D%2245742%22%20fill%3D%22%23EDB500%22%3E%3C/path%3E%3C/svg%3E);
+ content: '';
+ position: absolute;
+ width:40rpx;height:40rpx;
+ right: -20rpx;top:10rpx;
+ background-size: 100%;
+}
+.step-area .steps .item:last-child::after{
+ display: none;
+}
\ No newline at end of file