Skip to content

Commit

Permalink
Merge branch 'unicloud'
Browse files Browse the repository at this point in the history
  • Loading branch information
Samciu committed Jun 28, 2021
2 parents 1b4cbf0 + b05f3e6 commit ba143e5
Show file tree
Hide file tree
Showing 16 changed files with 1,275 additions and 76 deletions.
16 changes: 16 additions & 0 deletions components/customTabBar/customTabBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,22 @@
<text class="label">权益</text>
</navigator>
<navigator
class="item"
:class="{ active: tab == 'sign' }"
open-type="switchTab"
url="/pages/activity/sign"
>
<image
class="icon"
src="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-cf26384b-87c0-45b4-a7e2-8a03c1243555/bdae6b84-335d-455a-817f-3626d458e20b.png"
></image>
<image
class="focus-icon"
src="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-cf26384b-87c0-45b4-a7e2-8a03c1243555/e4cdf16b-5a9b-40ec-9681-949376d9c755.png"
></image>
<text class="label">打卡</text>
</navigator>
<navigator
class="item"
:class="{ active: tab == 'mall' }"
open-type="switchTab"
Expand Down
2 changes: 1 addition & 1 deletion components/login/login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ export default {
const { token, user } = res.data.data;
this.setUserData({ token, user });
this.setLoginShow(false);
uni.reLaunch({ url: `/${getCurrentPageUrlWithArgs()}` });
uni.reLaunch({ url: `${getCurrentPageUrlWithArgs()}` });
},
},
};
Expand Down
3 changes: 2 additions & 1 deletion config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@

export default {
baseUrl: "https://zy-api.wxthe.com",
Appid: 'zyc4dd3668ee9a2a46'
Appid: 'zy36aab89b0773212d',
usePlugin: true
}
11 changes: 9 additions & 2 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,24 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
"appid" : "wxd959c7430a650199",
"appid" : "wxdbf601ed08e4d7ea",
"setting" : {
"urlCheck" : false
},
"usingComponents" : {
"pay-user-info" : "plugin://myPlugin/pay-user-info"
"pay-user-info" : "plugin://myPlugin/pay-user-info",
"pay" : "plugin://myPlugin/pay"
},
"permission" : {
"scope.userLocation" : {
"desc" : "获取商家信息"
}
},
"plugins" : {
"myPlugin" : {
"version" : "2.0.0",
"provider" : "wx468ad252a66afc34"
}
}
},
"mp-alipay" : {
Expand Down
65 changes: 46 additions & 19 deletions pages.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@
"navigationStyle": "custom"
}
},
{
"path" : "pages/activity/sign",
"style" :
{
"navigationBarTitleText": "免费领会员",
"enablePullDownRefresh": false
}
},
{
"path": "pages/mall/mall",
"style": {
Expand All @@ -19,8 +27,8 @@
"enablePullDownRefresh": true
}

}
,{
},
{
"path" : "pages/detail/detail",
"style" :
{
Expand Down Expand Up @@ -63,7 +71,12 @@
"style" :
{
"navigationBarTitleText": "我的订单",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"mp-weixin": {
"usingComponents": {
"pay": "plugin://myPlugin/pay"
}
}
}
},
{
Expand All @@ -72,7 +85,12 @@
{
"navigationBarTitleText": "订单详情",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
"navigationStyle": "custom",
"mp-weixin": {
"usingComponents": {
"pay": "plugin://myPlugin/pay"
}
}
}

},
Expand All @@ -95,21 +113,26 @@
"enablePullDownRefresh": false
}
},
{
"path" : "pages/product/recharge",
"style" :
{
"navigationBarTitleText": "会员充值",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
// {
// "path" : "pages/product/recharge",
// "style" :
// {
// "navigationBarTitleText": "会员充值",
// "enablePullDownRefresh": false,
// "navigationStyle": "custom"
// }

},
// },
{
"path": "pages/product/checkout",
"style": {
"navigationBarTitleText": "确认订单",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"mp-weixin": {
"usingComponents": {
"pay": "plugin://myPlugin/pay"
}
}
}
},
{
Expand Down Expand Up @@ -196,13 +219,14 @@
}
,{
"path" : "pages/webview/webview",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}

}

],
"globalStyle": {
"navigationBarTextStyle": "black",
Expand All @@ -227,6 +251,9 @@
},
{
"pagePath": "pages/user/user"
},
{
"pagePath": "pages/activity/sign"
}
],
"custom": true
Expand Down
88 changes: 88 additions & 0 deletions pages/activity/components/contactBox/contactBox.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
<template>
<view class="popup_content">
<view class="rules_txt">
<view class="title">联系客服</view>
<view class="scroll">
<view class="content">请联系客服领取会员卡</view>
<button class="button" open-type="contact">联系客服</button>
</view>
</view>
<view class="closed" @click="close"></view>
</view>
</template>

<script>
export default {
props: ["rules"],
methods: {
close() {
this.$emit("closeExchange");
},
},
};
</script>

<style lang="scss">
.popup_content {
width: 100vw;
height: 100vh;
justify-content: center;
display: flex;
align-items: center;
flex-direction: column;
.rules_txt {
display: flex;
align-items: center;
flex-direction: column;
width: 580rpx;
border-radius: 12rpx;
background: #fff;
box-sizing: border-box;
padding: 60rpx 40rpx;
overflow: hidden;
justify-content: space-between;
.title {
font-weight: bolder;
font-size: 40rpx;
line-height: 56rpx;
text-align: center;
color: #000;
}
.scroll {
overflow: hidden;
text-align: center;
}
.content {
padding-top: 30rpx;
text-align: center;
}
.button {
display: block;
margin: 0 auto;
margin-top: 40rpx;
width: 224rpx;
height: 84rpx;
border-radius: 46rpx;
line-height: 84rpx;
font-size: 32rpx;
text-align: center;
background: #ec5959;
color: #fff;
}
}
.closed {
width: 80rpx;
height: 80rpx;
margin-top: 16rpx;
background: url("https://vkceyugu.cdn.bspapp.com/VKCEYUGU-cf26384b-87c0-45b4-a7e2-8a03c1243555/ca54adf5-12bf-43ae-9515-02140eaba5ec.png")
no-repeat;
background-size: 100%;
}
}
</style>
90 changes: 90 additions & 0 deletions pages/activity/components/rulesBox/rulesBox.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
<template>
<view class="popup_content">
<view class="rules_txt">
<view class="title">活动规则</view>
<view class="scroll">
<scroll-view class="scroll_box" scrollY="true">
<view v-for="item,index in rules" :key="index">
<text>{{item}}</text>
</view>
</scroll-view>
</view>
</view>
<view class="closed" @click="close"></view>
</view>
</template>

<script>
export default {
props: ["rules"],
methods: {
close() {
this.$emit("closePopup")
}
},
}
</script>

<style lang="scss">
.popup_content {
width: 100vw;
height: 100vh;
justify-content: center;
display: flex;
align-items: center;
flex-direction: column;
.rules_txt {
display: flex;
align-items: center;
flex-direction: column;
width: 686rpx;
height: 648rpx;
border-radius: 40rpx;
background: #fff;
box-sizing: border-box;
padding: 60rpx 40rpx;
overflow: hidden;
justify-content: space-between;
.title {
font-weight: bolder;
font-size: 40rpx;
line-height: 56rpx;
text-align: center;
color: #000;
}
.scroll {
width: 606rpx;
height: 440rpx;
overflow: hidden;
}
.scroll_box {
width: 618rpx;
height: 440rpx;
display: flex;
align-items: center;
overflow-y: scroll;
transform: translate(2rpx, 0);
text {
font-size: 28rpx;
line-height: 40rpx;
color: #575757;
}
}
}
.closed {
width: 80rpx;
height: 80rpx;
margin-top: 16rpx;
background: url("https://vkceyugu.cdn.bspapp.com/VKCEYUGU-cf26384b-87c0-45b4-a7e2-8a03c1243555/ca54adf5-12bf-43ae-9515-02140eaba5ec.png")
no-repeat;
background-size: 100%;
}
}
</style>
Loading

0 comments on commit ba143e5

Please sign in to comment.