From f67d395cce796a5dd90c94a45afa124b619aa164 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Mon, 2 Sep 2024 23:59:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=B8=8A=E7=BA=BF=E6=B5=8B?=
=?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 1 +
api/api.js | 6 +-
.../PrivacyAgreementPoup/PrivacyAgreementPoup.vue | 34 +++--
config.js | 6 +-
manifest.json | 2 +-
pages.json | 7 +
pages/center/center.vue | 16 +-
pages/contentDetail/contentDetail.vue | 102 ++++++++-----
pages/login/login.vue | 6 +-
pages/login/wxUserInfo.vue | 8 +-
static/empty/noData.png | Bin 0 -> 17165 bytes
static/login/6.png | Bin 0 -> 1443 bytes
store/store.js | 11 +-
uni_modules/uni-section/changelog.md | 2 +
.../components/uni-section/uni-section.vue | 167 +++++++++++++++++++++
uni_modules/uni-section/package.json | 87 +++++++++++
uni_modules/uni-section/readme.md | 8 +
17 files changed, 396 insertions(+), 67 deletions(-)
create mode 100644 static/empty/noData.png
create mode 100644 static/login/6.png
create mode 100644 uni_modules/uni-section/changelog.md
create mode 100644 uni_modules/uni-section/components/uni-section/uni-section.vue
create mode 100644 uni_modules/uni-section/package.json
create mode 100644 uni_modules/uni-section/readme.md
diff --git a/App.vue b/App.vue
index 8c2b732..9a00df9 100644
--- a/App.vue
+++ b/App.vue
@@ -2,6 +2,7 @@
export default {
onLaunch: function() {
console.log('App Launch')
+ this.$store.commit('initConfig')
},
onShow: function() {
console.log('App Show')
diff --git a/api/api.js b/api/api.js
index e8b9114..23c18ba 100644
--- a/api/api.js
+++ b/api/api.js
@@ -19,7 +19,11 @@ const config = {
//获取订单列表
getPayOrderPage : {url : '/pay-api/info/getPayOrderPage', method : 'GET'},
//修改个人信息
- updateInfo : {url : '/pay-api/info/updateInfo', method : 'GET', limit : 500},
+ updateInfo : {url : '/pay-api/info/updateInfo', method : 'POST', limit : 500},
+ //获取隐私政策
+ getPrivacyPolicy : {url : '/pay-api/login/getPrivacyPolicy', method : 'GET', limit : 500},
+ //获取用户协议
+ getUserAgreement : {url : '/pay-api/login/getUserAgreement', method : 'GET', limit : 500},
}
diff --git a/components/PrivacyAgreementPoup/PrivacyAgreementPoup.vue b/components/PrivacyAgreementPoup/PrivacyAgreementPoup.vue
index 5195078..843e32c 100644
--- a/components/PrivacyAgreementPoup/PrivacyAgreementPoup.vue
+++ b/components/PrivacyAgreementPoup/PrivacyAgreementPoup.vue
@@ -6,7 +6,7 @@
- 欢迎来到xx加油!我们根据最新的法律法规、监管政策要求，更新了《用户协议》和《隐私政策》,请您认真阅读。
+ 欢迎来到家乐美统计系统!我们根据最新的法律法规、监管政策要求，更新了《用户协议》和《隐私政策》,请您认真阅读。
@@ -14,10 +14,10 @@
- 同意《xx加油隐私政策》
+ 同意《家乐美统计系统隐私政策》
- 以及《用户协议》
+ 以及《用户协议》
@@ -40,6 +40,20 @@
checkboxValue : false
}
},
+ mounted() {
+ if(wx.getPrivacySetting){
+ wx.getPrivacySetting({
+ success: res => {
+ console.log(res)
+ if (res.needAuthorization) {
+ // 需要弹出隐私协议
+ this.init()
+ }
+ },
+ fail: () => {}
+ })
+ }
+ },
methods: {
//初始化
@@ -66,18 +80,18 @@
// 拒绝
confusePrivacy() {
this.$refs.popup.close()
- this.resolvePrivacyAuthorization({
- event: 'disagree'
- })
+ // this.resolvePrivacyAuthorization({
+ // event: 'disagree'
+ // })
},
// 同意
handleAgreePrivacyAuthorization() {
// 告知平台用户已经同意，参数传同意按钮的id
- this.resolvePrivacyAuthorization({
- buttonId: 'agree-btn',
- event: 'agree'
- })
+ // this.resolvePrivacyAuthorization({
+ // buttonId: 'agree-btn',
+ // event: 'agree'
+ // })
this.$refs.popup.close()
}
}
diff --git a/config.js b/config.js
index c7f5378..278e765 100644
--- a/config.js
+++ b/config.js
@@ -4,17 +4,17 @@ import api from '@/api/api.js'
import utils from './utils/utils.js'
// 当前环境
-const type = 'dev'
+const type = 'prod'
// 环境配置
const config = {
dev : {
// baseUrl : 'http://noticeadmin.augcl.com/a-notice-api',
- baseUrl : 'http://h5.xzaiyp.top/a-notice-api',
+ baseUrl : 'http://h5.xzaiyp.top/pay-admin',
},
prod : {
- baseUrl : 'http://admin.anqi.shop/a-notice-api',
+ baseUrl : 'https://pay-admin.xzaiyp.top/pay-admin',
}
}
diff --git a/manifest.json b/manifest.json
index 6c3a520..fced1b7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -50,7 +50,7 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
- "appid" : "wx3c24e397e3b132ea",
+ "appid" : "wxf173d7bec0f1bbe0",
"setting" : {
"urlCheck" : false
},
diff --git a/pages.json b/pages.json
index c34b103..0c2ae59 100644
--- a/pages.json
+++ b/pages.json
@@ -18,6 +18,13 @@
"navigationBarTitleText": "登录",
"navigationStyle": "custom"
}
+ },
+ {
+ "path": "pages/login/wxUserInfo",
+ "style": {
+ "navigationBarTitleText": "授权用户信息",
+ "navigationStyle": "custom"
+ }
}
],
"globalStyle": {
diff --git a/pages/center/center.vue b/pages/center/center.vue
index 60bde27..c3cbc2b 100644
--- a/pages/center/center.vue
+++ b/pages/center/center.vue
@@ -4,7 +4,9 @@
-
+
{{ userInfo.nickName }}
@@ -40,10 +42,17 @@
{{ item.price }}
+
+ {{ item.title }}
+
-
+
+
+ 空空如也！
+
@@ -194,6 +203,7 @@
background: white;
border-radius: 20rpx;
margin-bottom: 20rpx;
+ overflow: hidden;
}
.order-item .order-item-top {
@@ -238,6 +248,8 @@
display: flex;
justify-content: space-around;
align-items: center;
+ flex-direction: column;
+ color: #757575;
}
.listBox {
diff --git a/pages/contentDetail/contentDetail.vue b/pages/contentDetail/contentDetail.vue
index 3269855..54af0d3 100644
--- a/pages/contentDetail/contentDetail.vue
+++ b/pages/contentDetail/contentDetail.vue
@@ -5,23 +5,30 @@
- {{ shopInfo.title }}
+ {{ shopInfo.title }}
-
+
- 级别:初级
+ {{ shopInfo.classValue }}
- {{ shopInfo.num }}人学习
+ {{ shopInfo.num }}人购买
-
+
+
+
+ ￥{{ shopInfo.oldPrice }}
+
+
￥{{ shopInfo.price }}
-
+
+
+
@@ -45,40 +52,47 @@
- 无法查看资源内容，请购买!
+ {{ shopInfo.titleText }}
- 资源介绍
-
+ 资源介绍
+
-
-
-
- 客服
-
+
+
- 立即购买 ({{ shopInfo.price * registerForm.num }}￥)
+ 立即购买 (￥{{ shopInfo.price * registerForm.num }})
+
+
+
diff --git a/uni_modules/uni-section/package.json b/uni_modules/uni-section/package.json
new file mode 100644
index 0000000..0a31fb5
--- /dev/null
+++ b/uni_modules/uni-section/package.json
@@ -0,0 +1,87 @@
+{
+ "id": "uni-section",
+ "displayName": "uni-section 标题栏",
+ "version": "0.0.1",
+ "description": "标题栏组件",
+ "keywords": [
+ "uni-ui",
+ "uniui",
+ "标题栏"
+],
+ "repository": "https://github.com/dcloudio/uni-ui",
+ "engines": {
+ "HBuilderX": ""
+ },
+ "directories": {
+ "example": "../../temps/example_temps"
+ },
+ "dcloudext": {
+ "category": [
+ "前端组件",
+ "通用组件"
+ ],
+ "sale": {
+ "regular": {
+ "price": "0.00"
+ },
+ "sourcecode": {
+ "price": "0.00"
+ }
+ },
+ "contact": {
+ "qq": ""
+ },
+ "declaration": {
+ "ads": "无",
+ "data": "无",
+ "permissions": "无"
+ },
+ "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+ },
+ "uni_modules": {
+ "dependencies": [
+ "uni-scss"
+ ],
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "y",
+ "aliyun": "y"
+ },
+ "client": {
+ "App": {
+ "app-vue": "y",
+ "app-nvue": "y"
+ },
+ "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",
+ "字节跳动": "y",
+ "QQ": "y"
+ },
+ "快应用": {
+ "华为": "u",
+ "联盟": "u"
+ },
+ "Vue": {
+ "vue2": "y",
+ "vue3": "y"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-section/readme.md b/uni_modules/uni-section/readme.md
new file mode 100644
index 0000000..d47faab
--- /dev/null
+++ b/uni_modules/uni-section/readme.md
@@ -0,0 +1,8 @@
+## Section 标题栏
+> **组件名：uni-section**
+> 代码块： `uSection`
+
+uni-section 组件主要用于文章、列表详情等标题展示
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-section)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839