diff --git a/App.vue b/App.vue
index bc29f64..da24a3b 100644
--- a/App.vue
+++ b/App.vue
@@ -1,24 +1,36 @@
+@import 'uview-ui/index.scss';
+page {
+ background: #f5f5f5;
+ -webkit-text-size-adjust: 100% !important;
+}
+
diff --git a/apis/index.js b/apis/index.js
index 76f9f15..bad3e74 100644
--- a/apis/index.js
+++ b/apis/index.js
@@ -31,7 +31,7 @@ const request = (parameter) => {
'Authorization': store.getters.getToken || ''
}
- console.log('parameterDbug', parameter)
+ // console.log('parameterDbug', parameter)
// 加载提示
uni.showLoading({
diff --git a/apis/interfaces/mine.js b/apis/interfaces/mine.js
index d154f62..2793945 100644
--- a/apis/interfaces/mine.js
+++ b/apis/interfaces/mine.js
@@ -1,97 +1,99 @@
-/**
- * Web-zdx
- * moduleName:个人中心相关操作
- */
-
-import { request } from '../index'
-
-// 关注店铺
-const shopSubscribe = (id) => {
- return request({
- url: 'mall/shops/subscribe/' + id,
- method: 'POST'
- })
-}
-
-// 我的关注店铺列表
-const shopSubscribeList = (page) => {
- return request({
- url: 'mall/shops/subscribe',
- method:'get',
- data:{
- page:page
- }
- })
-}
-
-// 关于我们
-const aboutUs = () => {
- return request({
- url: 'articles/about'
- })
-}
-
-// 获取用户信息
-const getUserInfo = () => {
- return request({
- url: 'user/app'
- })
-}
-
-// 获取用户设置中心的信息
-const getUserSettingInfo = () => {
- return request({
- url: 'user/setting'
- })
-}
-
-// 账号余额等信息
-const chaineb = (data) => {
- return request({
- url: 'user/account/chaineb',
- method:'get',
- data:data
- })
-}
-
-// 我的足迹
-const browsers = (page) => {
- return request({
- url: 'mall/goods/browsers',
- method: 'get',
- data: {
- page:page,
- page_size:20
- }
- })
-}
-
-// 修改用户头像或昵称
-const resetUserInfo= (data) => {
- return request({
- url: 'user/'+data.key,
- method: 'PUT',
- data:{
- value:data.value
- }
- })
-}
-
-// 我的推广码
-const appcode = () => {
- return request({
- url: 'user/appcode'
- })
-}
-
-export {
- shopSubscribe,
- shopSubscribeList,
- aboutUs,
- getUserInfo,
- getUserSettingInfo,
- chaineb,
- browsers,
- resetUserInfo,
- appcode
+/**
+ * Web-zdx
+ * moduleName:个人中心相关操作
+ */
+
+import {
+ request
+} from '../index'
+
+// 关注店铺
+const shopSubscribe = (id) => {
+ return request({
+ url: 'mall/shops/subscribe/' + id,
+ method: 'POST'
+ })
+}
+
+// 我的关注店铺列表
+const shopSubscribeList = (page) => {
+ return request({
+ url: 'mall/shops/subscribe',
+ method: 'get',
+ data: {
+ page: page
+ }
+ })
+}
+
+// 关于我们
+const aboutUs = () => {
+ return request({
+ url: 'articles/about'
+ })
+}
+
+// 获取用户信息
+const getUserInfo = () => {
+ return request({
+ url: 'user/app'
+ })
+}
+
+// 获取用户设置中心的信息
+const getUserSettingInfo = () => {
+ return request({
+ url: 'user/setting'
+ })
+}
+
+// 账号余额等信息
+const chaineb = (data) => {
+ return request({
+ url: 'user/account/chaineb',
+ method: 'get',
+ data: data
+ })
+}
+
+// 我的足迹
+const browsers = (page) => {
+ return request({
+ url: 'mall/goods/browsers',
+ method: 'get',
+ data: {
+ page: page,
+ page_size: 20
+ }
+ })
+}
+
+// 修改用户头像或昵称
+const resetUserInfo = (data) => {
+ return request({
+ url: 'user/' + data.key,
+ method: 'PUT',
+ data: {
+ value: data.value
+ }
+ })
+}
+
+// 我的推广码
+const appcode = () => {
+ return request({
+ url: 'user/appcode'
+ })
+}
+
+export {
+ shopSubscribe,
+ shopSubscribeList,
+ aboutUs,
+ getUserInfo,
+ getUserSettingInfo,
+ chaineb,
+ browsers,
+ resetUserInfo,
+ appcode
}
diff --git a/components/store-boss/store-boss.vue b/components/store-boss/store-boss.vue
index c0c6087..83eab00 100644
--- a/components/store-boss/store-boss.vue
+++ b/components/store-boss/store-boss.vue
@@ -30,7 +30,7 @@
会员升级/续费
续费
企业会员
- 有效期：{{wordData.identity}}
+ 有效期：{{wordData.identity}}
diff --git a/pages.json b/pages.json
index 06ee5e0..e97e1e3 100644
--- a/pages.json
+++ b/pages.json
@@ -507,7 +507,7 @@
}
}, {
"path": "pages/coupons/couponList",
- "name": "Coupons",
+ "name": "CouponsList",
"style": {
"enablePullDownRefresh": true,
"navigationBarTextStyle": "white",
diff --git a/pages/coupons/add.vue b/pages/coupons/add.vue
index fda1462..d484881 100644
--- a/pages/coupons/add.vue
+++ b/pages/coupons/add.vue
@@ -79,7 +79,20 @@
{{datePickerValue.length == 0 ? '选择优惠券有效期区间': datePickerValue[0] + ' 至 ' + datePickerValue[1]}}
-
+
+
+
@@ -107,6 +120,7 @@