diff --git a/app.js b/app.js index 50367a9..de34829 100644 --- a/app.js +++ b/app.js @@ -2,7 +2,7 @@ import updateManager from './common/updateManager'; // export const ServerBasePath = 'http://localhost:8888/api/'; // export const ServerBasePath = 'http://192.168.1.102:8888/api/'; -export const ServerBasePath = 'http://emo-api.aerwen.net/api/'; +export const ServerBasePath = 'https://emo-api.aerwen.net/api/'; App({ onLaunch: function () {}, diff --git a/app.json b/app.json index 3258543..d660f04 100644 --- a/app.json +++ b/app.json @@ -2,17 +2,7 @@ "pages": [ "pages/home/home", "pages/home/search/index", - "pages/login/login", - "pages/login/authorize-avatar-name/index", - "pages/login/phone-register/index", - "pages/login/agree-link/index", - "pages/emoticon/result/index", - "pages/usercenter/index", - "pages/usercenter/goods-collect/index", - "pages/usercenter/goods-history/index", - "pages/usercenter/person-info/index", - "pages/usercenter/set/index", - "pages/usercenter/name-edit/index" + "pages/emoticon/result/index" ], "tabBar": { "custom": true, @@ -26,8 +16,8 @@ "text": "首页" }, { - "pagePath": "pages/usercenter/index", - "text": "我的" + "pagePath": "pages/home/search/index", + "text": "搜索" } ] }, diff --git a/custom-tab-bar/data.js b/custom-tab-bar/data.js index 8d53290..6106195 100644 --- a/custom-tab-bar/data.js +++ b/custom-tab-bar/data.js @@ -3,10 +3,5 @@ export default [ icon: 'home', text: '首页', url: 'pages/home/home', - }, - { - icon: 'person', - text: '个人中心', - url: 'pages/usercenter/index', - }, + } ]; diff --git a/pages/emoticon/result/index.js b/pages/emoticon/result/index.js index 16e7325..77855b9 100644 --- a/pages/emoticon/result/index.js +++ b/pages/emoticon/result/index.js @@ -32,7 +32,7 @@ Page({ total: 0, pageNum: 1, - pageSize: 10, + pageSize: 20, onLoad(options) { const { @@ -64,7 +64,7 @@ Page({ const params = { pageNum: 1, - pageSize: 10, + pageSize: 20, search: keywords, emoticonCategoryGuid: categoryGuid }; diff --git a/pages/emoticon/result/index.wxml b/pages/emoticon/result/index.wxml index 9323589..5a6e866 100644 --- a/pages/emoticon/result/index.wxml +++ b/pages/emoticon/result/index.wxml @@ -26,7 +26,7 @@ - + diff --git a/pages/home/home.js b/pages/home/home.js index 3b55603..b460e98 100644 --- a/pages/home/home.js +++ b/pages/home/home.js @@ -131,7 +131,7 @@ Page({ getEmoticonDataList(params).then((res) => { if (res.code == 200) { this.page.num++; - + this.setData({ lastUpdatedList: this.data.lastUpdatedList.concat(res.data.result), loadMoreStatus: 0 @@ -200,4 +200,36 @@ Page({ }); }, + // 点击分享 + onShareAppMessage() { + const promise = new Promise(resolve => { + setTimeout(() => { + resolve({ + title: '表情包图片大全' + }) + }, 2000) + }) + return { + title: '表情包图片大全', + path: '/pages/home/home', + promise + } + }, + + // 点击分享朋友圈 + onShareTimeline(){ + const promise = new Promise(resolve => { + setTimeout(() => { + resolve({ + title: '表情包图片大全' + }) + }, 2000) + }) + return { + title: '表情包图片大全', + path: '/pages/home/home', + promise + } + } + }); \ No newline at end of file diff --git a/pages/home/home.wxml b/pages/home/home.wxml index 158b0c5..727ab2a 100644 --- a/pages/home/home.wxml +++ b/pages/home/home.wxml @@ -4,7 +4,7 @@ - + @@ -47,7 +47,7 @@ - + 热门表情包 @@ -64,7 +64,7 @@ - + {{item.emotionCategoryName}} @@ -76,7 +76,7 @@ - + 最近更新 @@ -92,7 +92,7 @@ - + diff --git a/pages/login/agree-link/index.js b/pages/login/agree-link/index.js deleted file mode 100644 index fef71d1..0000000 --- a/pages/login/agree-link/index.js +++ /dev/null @@ -1,70 +0,0 @@ -import { - getPlatformSpecDetails -} from '~/services/login/getPlatformSpecDetails'; - -Page({ - /** - * 页面的初始数据 - */ - data: { - detailsData: {} - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - getPlatformSpecDetails({ - PlatformSpecGuid: options.guid - }).then(res => { - this.setData({ - detailsData: res.data - }) - wx.setNavigationBarTitle({ - title: this.data.detailsData.platformSpecTitle - }) - }) - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - - }, -}) \ No newline at end of file diff --git a/pages/login/agree-link/index.json b/pages/login/agree-link/index.json deleted file mode 100644 index 81a4e80..0000000 --- a/pages/login/agree-link/index.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "usingComponents": { - }, - "navigationBarTitleText": "" -} \ No newline at end of file diff --git a/pages/login/agree-link/index.wxml b/pages/login/agree-link/index.wxml deleted file mode 100644 index bbd37ed..0000000 --- a/pages/login/agree-link/index.wxml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/pages/login/agree-link/index.wxss b/pages/login/agree-link/index.wxss deleted file mode 100644 index e69de29..0000000 diff --git a/pages/login/authorize-avatar-name/index.js b/pages/login/authorize-avatar-name/index.js deleted file mode 100644 index c8e10ca..0000000 --- a/pages/login/authorize-avatar-name/index.js +++ /dev/null @@ -1,107 +0,0 @@ -// pages/login/authorize-avatar-name/index.js -Page({ - - /** - * 页面的初始数据 - */ - data: { - image: "https://cdn-we-retail.ym.tencent.com/miniapp/usercenter/icon-user-center-avatar@2x.png", - }, - - login() { - var that = this; - // 基础库要在2.27.1以下才可以使用 - wx.getUserProfile({ - //获取用户信息。页面产生点击事件（例如 button 上 bindtap 的回调中）后才可调用，每次请求都会弹出授权窗口，用户同意后返回 userInfo,用于替换 wx.getUserInfo - lang: 'zh_CN', - desc: '用于在后台更好的识别您的身份', //声明获取用户个人信息后的用途 - success(user) { - //接口调用成功的回调函数 - const data = { - encryptedData: user.encryptedData, - iv: user.iv, - // signature: user.signature, - // rawData: user.rawData, - userInfo: user.userInfo, - }; - - // app.request({ - // url: `login`, - // method: 'POST', - // data: data, - // success: async function (res) { - // // wx.setStorageSync('userInfo', res); - // app.put('userInfo', res, 86400); - // const userInfo = app.get('userInfo'); - - // // 如果第一次登录就注册一个客户账号 - - - // }, - // }); - }, - fail() { - wx.switchTab({ - url: '/pages/home/home', - }); - }, - }); - }, - - - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - - } -}) \ No newline at end of file diff --git a/pages/login/authorize-avatar-name/index.json b/pages/login/authorize-avatar-name/index.json deleted file mode 100644 index f01f281..0000000 --- a/pages/login/authorize-avatar-name/index.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "usingComponents": { - "t-avatar": "tdesign-miniprogram/avatar/avatar", - "van-button": "@vant/weapp/button/index" - }, - "navigationBarTitleText": "授权登录" -} \ No newline at end of file diff --git a/pages/login/authorize-avatar-name/index.wxml b/pages/login/authorize-avatar-name/index.wxml deleted file mode 100644 index 25ad392..0000000 --- a/pages/login/authorize-avatar-name/index.wxml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - 申请获取以下权限 - 获得你的公开信息（昵称、头像等） - - - - - 授权登录 - - 暂不登录 - - - \ No newline at end of file diff --git a/pages/login/authorize-avatar-name/index.wxss b/pages/login/authorize-avatar-name/index.wxss deleted file mode 100644 index b743276..0000000 --- a/pages/login/authorize-avatar-name/index.wxss +++ /dev/null @@ -1,61 +0,0 @@ -/* pages/login/authorize-avatar-name/index.wxss */ - -.mainContainer { - width: 85%; - margin: 0 auto; -} - -/* 头部头像盒子 */ -.top-avatar-box { - margin-top: 50rpx; - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; -} - -.avatar-img-box { - width: 180rpx; - height: 180rpx; - border-radius: 50%; - overflow: hidden; - padding: 5rpx; - box-shadow: 0 0 15rpx 5rpx #e8e8e8; -} - -.avatar-img { - width: 100%; - height: 100%; - object-fit: cover; -} - -.avatar-line { - width: 100%; - height: 1px; - background-color: #e3e3e3; - margin-top: 50rpx; -} - - -/* 权限文字盒子 */ -.authorize-content-box { - margin: 80rpx 0; -} - -.authorize-content-title { - font-size: 35rpx; - margin-bottom:40rpx; - color: #585858; -} - -.authorize-content-text{ - font-size:30rpx; - color: #888888; -} - - -/* 授权按钮盒子 */ -.authorize-btn{ - margin-bottom: 25rpx; -} - diff --git a/pages/login/login.js b/pages/login/login.js deleted file mode 100644 index d47e294..0000000 --- a/pages/login/login.js +++ /dev/null @@ -1,148 +0,0 @@ -// pages/login/login.js -import Toast from '~/miniprogram_npm/@vant/weapp/toast/toast'; -import { - login -} from '~/services/login/login'; -import { - getOpenId -} from '~/services/login/getOpenId'; -import { - getPlatformSpecList -} from '~/services/login/getPlatformSpecList'; - -Page({ - /** - * 页面的初始数据 - */ - data: { - back: true, - bg_image: "", - checked: true, - code: "", - agree_Link: {} - }, - - // 获取手机号 - getPhoneNumber(e) { - console.log(e,'adsasdasdasd'); - let that = this - if (that.data.checked == false) { - Toast({ - context: this, - selector: '#t-toast', - message: '请勾选同意按钮', - duration: 2000, - icon: '', - }); - return; - } - - if (e.detail.code) { - let phoneCode = e.detail.code - let openId = wx.getStorageSync('openId') - - let data = { - CustomerXcxOpenid: openId, - Code: phoneCode - } - - // 登录请求 - login(data).then((res) => { - if (res.data != null) { - that.setData({ - back: false - }) - } - }) - } else {} - }, - - // 跳转到手机号登录 - gotoPhoneRegister() { - wx.navigateTo({ - url: `/pages/login/phone-register/index`, - }); - }, - - // 选择是否已同意 - onChangeChecked() { - this.setData({ - checked: !this.data.checked - }) - }, - - //协议点击 - agreeLink(data) { - wx.navigateTo({ - url: '/pages/login/agree-link/index?guid=' + data.currentTarget.dataset.guid - }); - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad() { - let that = this - // 获取OpenId的code - wx.login({ - success(res) { - that.setData({ - code: res.code - }) - getOpenId({ - code: res.code - }).then((res) => { - wx.setStorageSync('openId', res.data) - }) - }, - }); - // 获取平台资质与规范列表 - getPlatformSpecList().then(res => { - this.setData({ - agree_Link: res.data - }) - }) - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() {}, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() {}, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() {}, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - let that = this - if (that.data.back == true) { - wx.reLaunch({ - url: '/pages/home/home' - }) - } - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() {}, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() {}, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() {}, -}); \ No newline at end of file diff --git a/pages/login/login.json b/pages/login/login.json deleted file mode 100644 index 0a1b88a..0000000 --- a/pages/login/login.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "usingComponents": { - "van-button": "@vant/weapp/button/index", - "van-checkbox": "@vant/weapp/checkbox/index" - }, - "navigationBarTitleText": "授权登录" -} \ No newline at end of file diff --git a/pages/login/login.wxml b/pages/login/login.wxml deleted file mode 100644 index 4aa9944..0000000 --- a/pages/login/login.wxml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/pages/login/login.wxss b/pages/login/login.wxss deleted file mode 100644 index baacd8d..0000000 --- a/pages/login/login.wxss +++ /dev/null @@ -1,61 +0,0 @@ - -/* 背景图盒子 */ -.bg-box{ - width: 100%; - height: 100vh; - position: absolute; - top: 0; - left: 0; - overflow: hidden; - z-index: -1; -} - -.bg-box-img{ - width: 100%; - height: 100%; -} - - - - -/* 登录盒子 */ -.login-pos-box{ - height: 100vh; - position: relative; - display: flex; - justify-content: center; -} - -.login-container-box{ - width: 90%; - position: absolute; - top: 20%; - height: 220rpx; - background-color: white; - border-radius: 20rpx; -} - -.login-box{ - padding: 50rpx 40rpx; -} - -.phone-btn{ - color: black !important; - font-weight: bold; -} - -.agree-box{ - margin-top: 50rpx; - display: flex; -} - -.agree-text{ - font-size: 25rpx; - color: #555555; - margin-top: -3rpx; -} - -.agree-link{ - font-size: 26rpx; - color: red; -} diff --git a/pages/login/phone-register/index.js b/pages/login/phone-register/index.js deleted file mode 100644 index 5f47eb1..0000000 --- a/pages/login/phone-register/index.js +++ /dev/null @@ -1,115 +0,0 @@ -// pages/login/phone-register/index.js -import { - sendPhoneCode -} from '~/services/login/phone-register'; - -Page({ - - /** - * 页面的初始数据 - */ - data: { - logoImg: "https://tool.aerwen.net/prod-api/Open/20230602/8969EAF2294B1FF4.png", - phoneNumber: "", //手机号 - phoneError: false, // 手机号验证 - verifyCode: "", //验证码 - }, - - - /** 发送验证码 */ - send() { - if (!this.data.phoneNumber) { - wx.showToast({ - icon: 'error', - title: '请输入手机号', - }); - return; - } - const isPhoneNumber = /^[1][3,4,5,7,8,9][0-9]{9}$/.test(this.data.phoneNumber); - if(!isPhoneNumber){ - wx.showToast({ - icon: 'error', - title: '手机号格式不正确', - }); - return; - } - - let data = { - PhoneNumber: this.data.phoneNumber, - } - sendPhoneCode(data) - }, - - - /** 手机号验证 */ - onPhoneInput(e) { - const { - phoneError - } = this.data; - const isPhoneNumber = /^[1][3,4,5,7,8,9][0-9]{9}$/.test(e.detail.value); - if (phoneError === isPhoneNumber) { - this.setData({ - phoneError: !isPhoneNumber, - phoneNumber: e.detail.value, - }); - } - }, - - - - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - - } -}) \ No newline at end of file diff --git a/pages/login/phone-register/index.json b/pages/login/phone-register/index.json deleted file mode 100644 index c5eacd0..0000000 --- a/pages/login/phone-register/index.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "usingComponents": { - "t-input": "tdesign-miniprogram/input/input", - "van-button": "@vant/weapp/button/index" - }, - "navigationBarTitleText": "" -} \ No newline at end of file diff --git a/pages/login/phone-register/index.wxml b/pages/login/phone-register/index.wxml deleted file mode 100644 index 7c530b1..0000000 --- a/pages/login/phone-register/index.wxml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - 阿尔文电商 - 一家有感情的电商模板 - - - - - - - - - - - - - - 发送验证码 - - - - - - 登录/注册 - - - - - - - \ No newline at end of file diff --git a/pages/login/phone-register/index.wxss b/pages/login/phone-register/index.wxss deleted file mode 100644 index 131feec..0000000 --- a/pages/login/phone-register/index.wxss +++ /dev/null @@ -1,43 +0,0 @@ -/* 手机号登录页Css */ - -/* Logo盒子 */ -.logo-box{ - margin-top: 50rpx; - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - text-align: center; -} - -.logo-img{ - width: 230rpx; - height: 230rpx; -} - -.logo-title{ - font-size: 40rpx; - letter-spacing: 4rpx; - font-weight: bold; -} - -.logo-text{ - font-size: 28rpx; - margin-top: 20rpx; - color: #999999; - letter-spacing: 2rpx; -} - - -/* 表单 */ -.register-form{ - margin-top: 100rpx; -} -.register-form-box{ - width: 90%; - margin: 0 auto; -} - -.submit-btn{ - margin-top: 50rpx; -} \ No newline at end of file diff --git a/pages/usercenter/components/t-location/index.js b/pages/usercenter/components/t-location/index.js deleted file mode 100644 index a1417ba..0000000 --- a/pages/usercenter/components/t-location/index.js +++ /dev/null @@ -1,124 +0,0 @@ -import { getPermission } from '../../../../utils/getPermission'; -import { phoneRegCheck } from '../../../../utils/util'; -import Toast from 'tdesign-miniprogram/toast/index'; -import { addressParse } from '../../../../utils/addressParse'; -import { resolveAddress, rejectAddress } from '../../address/list/util'; - -Component({ - externalClasses: ['t-class'], - properties: { - title: { - type: String, - }, - navigateUrl: { - type: String, - }, - navigateEvent: { - type: String, - }, - isCustomStyle: { - type: Boolean, - value: false, - }, - isDisabledBtn: { - type: Boolean, - value: false, - }, - isOrderSure: { - type: Boolean, - value: false, - }, - }, - methods: { - getWxLocation() { - if (this.properties.isDisabledBtn) return; - getPermission({ code: 'scope.address', name: '通讯地址' }).then(() => { - wx.chooseAddress({ - success: async (options) => { - const { provinceName, cityName, countyName, detailInfo, userName, telNumber } = options; - - if (!phoneRegCheck(telNumber)) { - Toast({ - context: this, - selector: '#t-toast', - message: '请填写正确的手机号', - }); - return; - } - - const target = { - name: userName, - phone: telNumber, - countryName: '中国', - countryCode: 'chn', - detailAddress: detailInfo, - provinceName: provinceName, - cityName: cityName, - districtName: countyName, - isDefault: false, - isOrderSure: this.properties.isOrderSure, - }; - - try { - const { provinceCode, cityCode, districtCode } = await addressParse(provinceName, cityName, countyName); - - const params = Object.assign(target, { - provinceCode, - cityCode, - districtCode, - }); - if (this.properties.isOrderSure) { - this.onHandleSubmit(params); - } else if (this.properties.navigateUrl != '') { - const { navigateEvent } = this.properties; - this.triggerEvent('navigate'); - wx.navigateTo({ - url: this.properties.navigateUrl, - success: function (res) { - res.eventChannel.emit(navigateEvent, params); - }, - }); - } else { - this.triggerEvent('change', params); - } - } catch (error) { - wx.showToast({ title: '地址解析出错，请稍后再试', icon: 'none' }); - } - }, - fail(err) { - console.warn('未选择微信收货地址', err); - }, - }); - }); - }, - - async queryAddress(addressId) { - try { - const { data } = await apis.userInfo.queryAddress({ addressId }); - return data.userAddressVO; - } catch (err) { - console.error('查询地址错误', err); - throw err; - } - }, - - findPage(pageRouteUrl) { - const currentRoutes = getCurrentPages().map((v) => v.route); - return currentRoutes.indexOf(pageRouteUrl); - }, - - async onHandleSubmit(params) { - try { - const orderPageDeltaNum = this.findPage('pages/order/order-confirm/index'); - if (orderPageDeltaNum > -1) { - wx.navigateBack({ delta: 1 }); - resolveAddress(params); - return; - } - } catch (err) { - rejectAddress(params); - console.error(err); - } - }, - }, -}); diff --git a/pages/usercenter/components/t-location/index.json b/pages/usercenter/components/t-location/index.json deleted file mode 100644 index 4e3dc86..0000000 --- a/pages/usercenter/components/t-location/index.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "component": true, - "usingComponents": { - "t-cell": "tdesign-miniprogram/cell/cell", - "t-icon": "tdesign-miniprogram/icon/icon", - "t-toast": "tdesign-miniprogram/toast/toast" - } -} \ No newline at end of file diff --git a/pages/usercenter/components/t-location/index.wxml b/pages/usercenter/components/t-location/index.wxml deleted file mode 100644 index 692c5c8..0000000 --- a/pages/usercenter/components/t-location/index.wxml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - {{title}} - - - - - - - - - - - diff --git a/pages/usercenter/components/t-location/index.wxss b/pages/usercenter/components/t-location/index.wxss deleted file mode 100644 index 4ba6cbc..0000000 --- a/pages/usercenter/components/t-location/index.wxss +++ /dev/null @@ -1,19 +0,0 @@ -.wx-address .weixin { - display: inline-block; - font-size: 48rpx !important; - margin-right: 20rpx; - font-weight: normal; -} -.wx-address .cell { - padding: 32rpx 30rpx; - border-radius: 8rpx; -} -.wx-address .cell__title { - font-size: 30rpx; - color: #333333; -} -.wx-address-custom { - display: flex; - align-items: center; - font-size: 32rpx; -} diff --git a/pages/usercenter/components/ui-select-picker/index.js b/pages/usercenter/components/ui-select-picker/index.js deleted file mode 100644 index fff68cc..0000000 --- a/pages/usercenter/components/ui-select-picker/index.js +++ /dev/null @@ -1,73 +0,0 @@ -Component({ - properties: { - show: { - type: Boolean, - observer(show) { - if (!show) return; - this.updateDivisions(); - }, - }, - title: { - type: String, - value: '', - }, - value: { - type: String, - value: '', - observer() { - if (!this.data.show) return; - this.updateDivisions(); - }, - }, - pickerOptions: { - type: Array, - value: [], - observer() { - if (!this.data.show) return; - this.updateDivisions(); - }, - }, - headerVisible: { - type: Boolean, - value: true, - }, - }, - data: { - pickerValue: [], - }, - methods: { - updateDivisions() { - const { pickerOptions, value } = this.data; - const index = (pickerOptions || []).findIndex( - (item) => item.code === value, - ); - - setTimeout(() => { - this.setData({ pickerValue: index >= 0 ? [index] : [0] }); - }, 0); - }, - - getAreaByIndex(indexes) { - const { pickerOptions } = this.data; - return pickerOptions[indexes.toString()]; - }, - - onChange(e) { - const currentValue = e.detail.value; - const target = this.getAreaByIndex(currentValue); - if (target === null) return; - - this.setData({ pickerValue: currentValue }); - this.triggerEvent('change', { value: target.code, target: target }); - }, - - onConfirm() { - const target = this.getAreaByIndex(this.data.pickerValue); - this.triggerEvent('confirm', { value: target?.code, target }); - }, - - onClose() { - this.triggerEvent('close'); - }, - }, -}); diff --git a/pages/usercenter/components/ui-select-picker/index.json b/pages/usercenter/components/ui-select-picker/index.json deleted file mode 100644 index 6e4c04e..0000000 --- a/pages/usercenter/components/ui-select-picker/index.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "component": true, - "usingComponents": { - "t-popup": "tdesign-miniprogram/popup/popup" - } -} diff --git a/pages/usercenter/components/ui-select-picker/index.wxml b/pages/usercenter/components/ui-select-picker/index.wxml deleted file mode 100644 index 6e3cddc..0000000 --- a/pages/usercenter/components/ui-select-picker/index.wxml +++ /dev/null @@ -1,21 +0,0 @@ - - - - 取消 - {{title}} - 确定 - - - {{title}} - - - - {{ item.name }} - - - - 取消 - 确定 - - - diff --git a/pages/usercenter/components/ui-select-picker/index.wxss b/pages/usercenter/components/ui-select-picker/index.wxss deleted file mode 100644 index 3e977be..0000000 --- a/pages/usercenter/components/ui-select-picker/index.wxss +++ /dev/null @@ -1,102 +0,0 @@ -.city-picker-container { - opacity: 0; - position: fixed; - top: 100vh; - left: 0; - right: 0; - height: 100vh; - z-index: 100; -} -.city-picker-container.show { - top: 0; - opacity: 1; -} -.city-picker-container.show .city-picker-box { - bottom: 0; -} -.city-picker-shadow { - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - background-color: rgba(0, 0, 0, 0.65); -} -.city-picker-header { - height: 100rpx; - line-height: 100rpx; - text-align: center; - font-size: 32rpx; - color: #333333; -} -.city-picker-more { - display: flex; - justify-content: space-between; - align-items: center; -} -.city-picker-footer { - height: 100rpx; - display: flex; - justify-content: space-between; - align-items: center; -} -.city-picker-footer .btn { - width: 330rpx; - height: 80rpx; - line-height: 80rpx; - text-align: center; - color: #666666; - font-size: 32rpx; - position: relative; -} -.city-picker-footer .btn__active { - opacity: 0.5; -} -.city-picker-footer .btn::after { - display: block; - content: ' '; - position: absolute; - left: -50%; - right: -50%; - top: -50%; - bottom: -50%; - transform: scale(0.5); - border: 1rpx solid #999999; - border-radius: 16rpx; -} -.city-picker-footer .btn.primary { - color: #fa550f; -} -.city-picker-footer .btn.primary::after { - border-color: #fa550f; -} -.picker-column:not(:first-child) { - margin-left: 40rpx; -} -.city-picker-box { - position: absolute; - bottom: -100%; - transition: 0.3s bottom ease-in-out; - left: 0; - right: 0; - z-index: 100; - background-color: #fff; - padding: 0 30rpx; - color: #333333; - font-size: 34rpx; - border-radius: 20rpx 20rpx 0 0; - padding-bottom: env(safe-area-inset-bottom); -} -.show .city-picker-shadow { - display: block; -} -.picker { - height: 300rpx; - margin: 50rpx 0; - line-height: 88rpx; - text-align: center; -} -/* 似乎小程序picker-view的bug，indicator-class仅height生效，其他诸如line-height、text-align等放到父class中设置 */ -.picker-center-row { - height: 88rpx; -} diff --git a/pages/usercenter/components/user-center-card/index.js b/pages/usercenter/components/user-center-card/index.js deleted file mode 100644 index 2b801aa..0000000 --- a/pages/usercenter/components/user-center-card/index.js +++ /dev/null @@ -1,38 +0,0 @@ -const AuthStepType = { - ONE: 1, - TWO: 2, - THREE: 3, -}; - -Component({ - options: { - multipleSlots: true, - }, - properties: { - currAuthStep: { - type: Number, - value: AuthStepType.ONE, - }, - userInfo: { - type: Object, - value: {}, - }, - isNeedGetUserInfo: { - type: Boolean, - value: false, - }, - }, - data: { - defaultAvatarUrl: - 'https://cdn-we-retail.ym.tencent.com/miniapp/usercenter/icon-user-center-avatar@2x.png', - AuthStepType, - }, - methods: { - gotoUserEditPage() { - this.triggerEvent('gotoUserEditPage'); - }, - gotoLogin(){ - wx.navigateTo({ url: '/pages/login/login' }); - } - }, -}); diff --git a/pages/usercenter/components/user-center-card/index.json b/pages/usercenter/components/user-center-card/index.json deleted file mode 100644 index e169f6f..0000000 --- a/pages/usercenter/components/user-center-card/index.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "component": true, - "usingComponents": { - "t-icon": "tdesign-miniprogram/icon/icon", - "t-avatar": "tdesign-miniprogram/avatar/avatar" - } -} \ No newline at end of file diff --git a/pages/usercenter/components/user-center-card/index.wxml b/pages/usercenter/components/user-center-card/index.wxml deleted file mode 100644 index 110abe8..0000000 --- a/pages/usercenter/components/user-center-card/index.wxml +++ /dev/null @@ -1,40 +0,0 @@ - - var toHide = function (array) { var mphone = array.substring(0, 3) + '****' + array.substring(7); return mphone; } - module.exports.toHide = toHide; - - - - - - - {{'请登录'}} - - - - - - - - {{userInfo.nickName || '微信用户'}} - {{phoneReg.toHide(userInfo.phoneNumber || '')}} - - - - - - - - - - - - - - {{userInfo.nickName || '微信用户'}} - - {{userInfo.nickName || '微信用户'}} - {{phoneReg.toHide(userInfo.phoneNumber || '')}} - - - - \ No newline at end of file diff --git a/pages/usercenter/components/user-center-card/index.wxss b/pages/usercenter/components/user-center-card/index.wxss deleted file mode 100644 index d4c9546..0000000 --- a/pages/usercenter/components/user-center-card/index.wxss +++ /dev/null @@ -1,58 +0,0 @@ -.user-center-card { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 480rpx; - /* 个人信息背景图 */ - background-image: url('https://cdn-we-retail.ym.tencent.com/miniapp/template/user-center-bg-v1.png'); - background-size: cover; - background-repeat: no-repeat; - padding: 0 35rpx; -} -.user-center-card__header { - margin-top: 192rpx; - margin-bottom: 48rpx; - height: 96rpx; - line-height: 48rpx; - display: flex; - justify-content: flex-start; - align-items: center; - color: #333; - position: relative; -} -.user-center-card__header__avatar { - width: 96rpx; - height: 96rpx; - border-radius: 48rpx; - overflow: hidden; -} - -.user-center-card__heade__text__box{ - margin-left: 24rpx; -} - -.user-center-card__header__name { - font-size: 36rpx; - line-height: 48rpx; - color: #333; - font-weight: bold; - margin-right: 16rpx; -} -.user-center-card__header__phone { - font-size: 30rpx; - margin-right: 16rpx; - margin-top: 5rpx; -} - -.user-center-card__header__transparent { - position: absolute; - left: 0; - top: 0; - background-color: transparent; - height: 100%; - width: 100%; -} -.user-center-card__icon { - line-height: 96rpx; -} diff --git a/pages/usercenter/goods-collect/index.js b/pages/usercenter/goods-collect/index.js deleted file mode 100644 index 6ca3b7a..0000000 --- a/pages/usercenter/goods-collect/index.js +++ /dev/null @@ -1,113 +0,0 @@ -import { - getGoodsCollectionList -} from '~/services/usercenter/goods-collect/getGoodsCollectionList'; - - -Page({ - page: { - size: 10, - num: 1, - }, - /** - * 页面的初始数据 - */ - data: { - list: [], - goodsListLoadStatus: 0 - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - this.init() - }, - - // 获取售后订单列表 - init(reset = false) { - const params = { - pageSize: this.page.size, - pageNum: this.page.num, - }; - this.setData({ - goodsListLoadStatus: 1, - }); - return getGoodsCollectionList(params) - .then((res) => { - this.page.num++; - - if (res && res.data && res.data.result) { - this.setData({ - list: this.data.list.concat(res.data.result), - goodsListLoadStatus: 0, - }); - } - - }).catch((err) => { - this.setData({ - goodsListLoadStatus: 3, - }); - return Promise.reject(err); - }); - }, - - gotoGoodsDetail(e) { - const { - index - } = e.detail; - const { - spuId - } = this.data.list[index]; - wx.navigateTo({ - url: `/pages/goods/details/index?spuId=${spuId}`, - }); - }, - - onReachBottom() { - if (this.data.goodsListLoadStatus === 0) { - this.init(); - } - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - - } -}) \ No newline at end of file diff --git a/pages/usercenter/goods-collect/index.json b/pages/usercenter/goods-collect/index.json deleted file mode 100644 index 724e8bc..0000000 --- a/pages/usercenter/goods-collect/index.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "navigationBarTitleText": "我的收藏", - "usingComponents": { - "t-empty": "tdesign-miniprogram/empty/empty", - "t-toast": "tdesign-miniprogram/toast/toast", - "load-more": "/components/load-more/index" - } -} \ No newline at end of file diff --git a/pages/usercenter/goods-collect/index.wxml b/pages/usercenter/goods-collect/index.wxml deleted file mode 100644 index a6571f0..0000000 --- a/pages/usercenter/goods-collect/index.wxml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/pages/usercenter/goods-collect/index.wxss b/pages/usercenter/goods-collect/index.wxss deleted file mode 100644 index 9ffdd1f..0000000 --- a/pages/usercenter/goods-collect/index.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/usercenter/goods-collect/index.wxss */ \ No newline at end of file diff --git a/pages/usercenter/goods-history/index.js b/pages/usercenter/goods-history/index.js deleted file mode 100644 index bb18a78..0000000 --- a/pages/usercenter/goods-history/index.js +++ /dev/null @@ -1,119 +0,0 @@ -import { - getGoodsBrowsingHistoryList -} from '~/services/usercenter/goods-history/getGoodsBrowsingHistoryList'; - - -Page({ - page: { - size: 10, - num: 1, - }, - /** - * 页面的初始数据 - */ - data: { - list: [], - goodsListLoadStatus: 0 - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - this.init() - }, - - onReTry() { - this.init(); - }, - - // 获取商品浏览记录列表 - async init(reset = false) { - const params = { - pageSize: this.page.size, - pageNum: this.page.num, - }; - this.setData({ - goodsListLoadStatus: 1, - }); - return getGoodsBrowsingHistoryList(params) - .then((res) => { - this.page.num++; - - if (res && res.data && res.data.result) { - this.setData({ - list: this.data.list.concat(res.data.result), - goodsListLoadStatus: 0, - }); - } - - - }) - .catch((err) => { - this.setData({ - goodsListLoadStatus: 3, - }); - return Promise.reject(err); - }); - }, - - gotoGoodsDetail(e) { - const { - index - } = e.detail; - const { - spuId - } = this.data.list[index]; - wx.navigateTo({ - url: `/pages/goods/details/index?spuId=${spuId}`, - }); - }, - - onReachBottom() { - if (this.data.goodsListLoadStatus === 0) { - this.init(); - } - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - - } -}) \ No newline at end of file diff --git a/pages/usercenter/goods-history/index.json b/pages/usercenter/goods-history/index.json deleted file mode 100644 index 9c2214c..0000000 --- a/pages/usercenter/goods-history/index.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "navigationBarTitleText": "我的浏览记录", - "usingComponents": { - "t-empty": "tdesign-miniprogram/empty/empty", - "t-toast": "tdesign-miniprogram/toast/toast", - "load-more": "/components/load-more/index" - } -} \ No newline at end of file diff --git a/pages/usercenter/goods-history/index.wxml b/pages/usercenter/goods-history/index.wxml deleted file mode 100644 index c1576e6..0000000 --- a/pages/usercenter/goods-history/index.wxml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/pages/usercenter/goods-history/index.wxss b/pages/usercenter/goods-history/index.wxss deleted file mode 100644 index c20ef43..0000000 --- a/pages/usercenter/goods-history/index.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/usercenter/goods-history/index.wxss */ \ No newline at end of file diff --git a/pages/usercenter/index.js b/pages/usercenter/index.js deleted file mode 100644 index d6ad028..0000000 --- a/pages/usercenter/index.js +++ /dev/null @@ -1,195 +0,0 @@ -import { - fetchUserCenter -} from '~/services/usercenter/fetchUsercenter'; -import { - getCustomerServiceList -} from '~/services/usercenter/getCustomerServiceList'; -import { - getOpenId -} from '~/services/login/getOpenId'; -import Toast from 'tdesign-miniprogram/toast/index'; - -const menuData = [ - [ - { - title: '设置', - tit: '', - url: '', - type: 'set', - }, - ], - [ - // { - // title: '帮助中心', - // tit: '', - // url: '', - // type: 'help-center', - // }, - { - title: '联系客服', - tit: '', - url: '', - type: 'service', - icon: 'service', - }, - ], -]; - -const getDefaultData = () => ({ - showMakePhone: false, - userInfo: { - avatarUrl: '', - nickName: '正在登录...', - phoneNumber: '', - }, - collectData: { - collectCount: 0, - historyCount: 0, - }, - menuData, - customerServiceInfo: {}, - currAuthStep: 1, - showKefu: true, - CustomerService: {}, -}); - -Page({ - data: getDefaultData(), - - onLoad() { - this.onGetCustomerServiceList(); - }, - - onShow() { - this.getTabBar().init(); - this.init(); - }, - onPullDownRefresh() { - this.init(); - }, - - init() { - this.fetUseriInfoHandle(); - }, - - /** 获取客户信息 */ - fetUseriInfoHandle() { - fetchUserCenter().then( - ({ - userInfo, - collectData, - }) => { - this.setData({ - userInfo, - collectData, - currAuthStep: 2, - }); - wx.stopPullDownRefresh(); - }, - ); - }, - - onClickCell({ - currentTarget - }) { - const { - type - } = currentTarget.dataset; - - switch (type) { - case 'service': { - this.openMakePhone(); - break; - } - case 'set': { - wx.navigateTo({ - url: '/pages/usercenter/set/index' - }); - break; - } - default: { - Toast({ - context: this, - selector: '#t-toast', - message: '未知跳转', - icon: '', - duration: 1000, - }); - break; - } - } - }, - - jumpAllOrder() { - wx.navigateTo({ - url: '/pages/order/order-list/index' - }); - }, - - jumpCollect() { - wx.navigateTo({ - url: '/pages/usercenter/goods-collect/index' - }); - }, - - jumpHistory() { - wx.navigateTo({ - url: '/pages/usercenter/goods-history/index' - }); - }, - - openMakePhone() { - this.setData({ - showMakePhone: true - }); - }, - - closeMakePhone() { - this.setData({ - showMakePhone: false - }); - }, - - call() { - wx.makePhoneCall({ - phoneNumber: this.data.customerServiceInfo.servicePhone, - }); - }, - - getOpenIdFun() { - wx.login({ - success(res) { - getOpenId({ - code: res.code - }).then((res) => { - wx.setStorageSync('openId', res.data) - }) - }, - }); - - }, - - gotoUserEditPage() { - const { - currAuthStep - } = this.data; - if (currAuthStep === 2) { - wx.navigateTo({ - url: '/pages/usercenter/person-info/index' - }); - } else { - // this.fetUseriInfoHandle(); - } - }, - - // 获取客服列表 - onGetCustomerServiceList() { - getCustomerServiceList().then((res) => { - if (res.code == 200) { - this.setData({ - CustomerService: res.data[0] - }) - } - }) - }, -}); \ No newline at end of file diff --git a/pages/usercenter/index.json b/pages/usercenter/index.json deleted file mode 100644 index d803545..0000000 --- a/pages/usercenter/index.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "navigationBarTitleText": "个人中心", - "navigationStyle": "custom", - "usingComponents": { - "t-popup": "tdesign-miniprogram/popup/popup", - "t-icon": "tdesign-miniprogram/icon/icon", - "t-cell-group": "tdesign-miniprogram/cell-group/cell-group", - "t-cell": "tdesign-miniprogram/cell/cell", - "t-user-center-card": "./components/user-center-card/index", - "t-toast": "tdesign-miniprogram/toast/toast" - }, - "enablePullDownRefresh": true -} \ No newline at end of file diff --git a/pages/usercenter/index.wxml b/pages/usercenter/index.wxml deleted file mode 100644 index 3e7f88e..0000000 --- a/pages/usercenter/index.wxml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - {{collectData.collectCount}} - 收藏 - - - - {{collectData.historyCount}} - 浏览记录 - - - - - - - - - - - - - - 客服电话 {{CustomerService.customerServicePhone}} - 工作时间 {{CustomerService.workingHoursBeginTime}}-{{CustomerService.workingHoursEndTime}} - - - - - - - - 取消 - - - \ No newline at end of file diff --git a/pages/usercenter/index.wxss b/pages/usercenter/index.wxss deleted file mode 100644 index ed97a32..0000000 --- a/pages/usercenter/index.wxss +++ /dev/null @@ -1,188 +0,0 @@ -page { - background-color: #f5f5f5; -} - -.content-wrapper { - margin-top: 340rpx; - position: relative; - padding: 0 30rpx; -} - -.main-content { - height: 500rpx; -} - -.order-group-wrapper { - margin-bottom: 16rpx; -} - -.order-group-note { - font-size: 28rpx; -} - -.cell-box { - border-radius: 10rpx; - overflow: hidden; - margin-bottom: 20rpx; -} - -.icon-color { - color: #aaa; -} - -.cell-class { - height: 100rpx; - display: flex; - align-items: center; -} - -.order-content { - overflow: hidden; - width: 100%; - display: flex; - background-color: #fff; - border-radius: 16rpx; -} - -.order-item { - flex: 1; - height: 180rpx; - overflow: hidden; - position: relative; - text-align: center; -} - -.order-content-box { - margin: auto; - position: absolute; - width: 100%; - top: 50%; - left: 50%; - -webkit-transform: translate(-50%, -50%); - -ms-transform: translate(-50%, -50%); - transform: translate(-50%, -50%); -} - -.order-content-t { - margin-top: 10rpx; - font-size: 24rpx; - color: #333; - letter-spacing: 0; - text-align: center; -} - -.popup-content { - background: #f5f5f5; - margin-bottom: env(safe-area-inset-bottom); - border-radius: 16rpx 16rpx 0 0; -} - -.popup-content .popup-title { - background: #fff; - text-align: center; - font-size: 24rpx; - color: #999; - height: 112rpx; - text-align: center; - line-height: 112rpx; - border-radius: 16rpx 16rpx 0 0; -} - -.border-bottom-1px { - position: relative; -} - -.border-bottom-1px::after { - position: absolute; - display: block; - content: ''; - box-sizing: border-box; - top: 0; - left: 0; - width: 200%; - height: 200%; - transform: scale(0.5); - transform-origin: left top; - border-bottom: 2rpx solid #e5e5e5; -} - -.popup-content .popup-phone, -.popup-content .popup-close { - background: #fff; - height: 100rpx; - display: flex; - justify-content: center; - align-items: center; - text-align: center; - font-size: 30rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #333; -} - -.popup-content .popup-phone.online { - margin-bottom: 20rpx; -} - -.popup-content .popup-phone.online::after { - content: none; -} - -.popup-content .popup-close { - color: #333; - border: 0; - /* margin-top: 16rpx; */ -} - -.customer-service-img, -.customer-service-img>image { - width: 100%; -} - -.my-order { - border-radius: 10rpx; -} - -.footer__version { - text-align: center; - color: #999; - margin-bottom: 4rpx; - font-size: 24rpx; - line-height: 32rpx; -} - -.cell-box .order-group__left { - margin-right: 0; -} - -.cell-box .t-cell-padding { - padding: 24rpx 18rpx 24rpx 32rpx; -} - -.order-history-box { - width: 90%; - display: flex; - justify-content: space-around; - margin: 30rpx auto; -} - -.order-history-content-box { - display: flex; - flex-direction: column; - align-items: center; - cursor: pointer; -} - -.order-history-content-num { - font-size: 35rpx; - font-weight: bold; - margin-bottom: 10rpx; -} - -.order-history-content-line { - /* width: 1rpx; */ - height: 80rpx; - border: 1px solid black; - display: flex; - align-self: center; -} \ No newline at end of file diff --git a/pages/usercenter/name-edit/index.js b/pages/usercenter/name-edit/index.js deleted file mode 100644 index 57e4e3d..0000000 --- a/pages/usercenter/name-edit/index.js +++ /dev/null @@ -1,19 +0,0 @@ -Page({ - data: { - nameValue: '', - }, - onLoad(options) { - const { name } = options; - this.setData({ - nameValue: name, - }); - }, - onSubmit() { - wx.navigateBack({ backRefresh: true }); - }, - clearContent() { - this.setData({ - nameValue: '', - }); - }, -}); diff --git a/pages/usercenter/name-edit/index.json b/pages/usercenter/name-edit/index.json deleted file mode 100644 index efc7e5f..0000000 --- a/pages/usercenter/name-edit/index.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "navigationBarTitleText": "昵称", - "usingComponents": { - "t-input": "tdesign-miniprogram/input/input", - "t-icon": "tdesign-miniprogram/icon/icon", - "t-button": "tdesign-miniprogram/button/button" - } -} diff --git a/pages/usercenter/name-edit/index.wxml b/pages/usercenter/name-edit/index.wxml deleted file mode 100644 index 2ceb518..0000000 --- a/pages/usercenter/name-edit/index.wxml +++ /dev/null @@ -1,14 +0,0 @@ - - - 最多可输入15个字 - - 保存 - - diff --git a/pages/usercenter/name-edit/index.wxss b/pages/usercenter/name-edit/index.wxss deleted file mode 100644 index 61674b3..0000000 --- a/pages/usercenter/name-edit/index.wxss +++ /dev/null @@ -1,18 +0,0 @@ -page { - background-color: #f5f5f5; -} -page view { - box-sizing: border-box; -} -.name-edit { - padding-top: 20rpx; -} -.name-edit .name-edit__input--desc { - font-size: 26rpx; - padding: 16rpx 32rpx; - color: #999; - margin-bottom: 200rpx; -} -.name-edit .name-edit__wrapper { - margin: 0 32rpx; -} diff --git a/pages/usercenter/person-info/index.js b/pages/usercenter/person-info/index.js deleted file mode 100644 index ec46df7..0000000 --- a/pages/usercenter/person-info/index.js +++ /dev/null @@ -1,197 +0,0 @@ -import { - fetchPerson -} from '~/services/usercenter/fetchPerson'; -import { - updatePerson -} from '~/services/usercenter/updatePerson'; -import { - phoneEncryption -} from '~/utils/util'; -import Toast from 'tdesign-miniprogram/toast/index'; -import { ServerBasePath } from '~/services/_utils/request' - -Page({ - data: { - personInfo: { - avatarUrl: '', - nickName: '', - gender: 0, - phoneNumber: '', - }, - showUnbindConfirm: false, - pickerOptions: [{ - name: '男', - code: '1', - }, - { - name: '女', - code: '2', - }, - ], - typeVisible: false, - genderMap: ['', '男', '女'], - }, - onLoad() { - this.init(); - }, - init() { - this.fetchData(); - }, - - fetchData() { - fetchPerson().then(({ - personInfo - }) => { - this.setData({ - personInfo, - 'personInfo.phoneNumber': phoneEncryption(personInfo.phoneNumber), - }); - }); - }, - - /** 提交 */ - submit() { - let personInfo = this.data.personInfo - let data = { - customerAvatar: personInfo.avatarUrl, - customerNickname: personInfo.nickName, - customerGender: personInfo.gender, - } - updatePerson(data).then((res) => { - if (res.code == 200) { - Toast({ - context: this, - selector: '#t-toast', - message: `保存成功`, - theme: 'success', - }) - wx.reLaunch({ - url: `/pages/usercenter/index`, - }); - } - }) - }, - - /** 点击单元格 */ - onClickCell({ - currentTarget - }) { - const { - dataset - } = currentTarget; - const { - nickName - } = this.data.personInfo; - - switch (dataset.type) { - case 'gender': - this.setData({ - typeVisible: true, - }); - break; - case 'name': - wx.navigateTo({ - url: `/pages/usercenter/name-edit/index?name=${nickName}`, - }); - break; - case 'avatarUrl': - this.toModifyAvatar(); - break; - default: { - break; - } - } - }, - onClose() { - this.setData({ - typeVisible: false, - }); - }, - onConfirm(e) { - const { - value - } = e.detail; - this.setData({ - typeVisible: false, - 'personInfo.gender': value, - }, - () => { - Toast({ - context: this, - selector: '#t-toast', - message: '设置成功', - theme: 'success', - }); - }, - ); - }, - - /** 修改昵称 */ - changeNickName(e) { - this.setData({ - 'personInfo.nickName': e.detail.value - }) - }, - - /** 修改头像 */ - async toModifyAvatar() { - let that = this - try { - const tempFilePath = await new Promise((resolve, reject) => { - wx.chooseImage({ - count: 1, - sizeType: ['compressed'], - sourceType: ['album', 'camera'], - success: (res) => { - const { - path, - size - } = res.tempFiles[0]; - const tempFilePaths = res.tempFilePaths; - let tempFilePath = tempFilePaths[0]; - // 上传图片到服务器 - wx.uploadFile({ - url: ServerBasePath + 'Common/UploadFile', // 上传接口地址 - filePath: tempFilePath, // 要上传的文件的临时路径 - name: 'file', // 上传文件对应的字段名 - success: function (uploadRes) { - // 上传成功，服务器返回的数据 - let url = JSON.parse(uploadRes.data).data.url - that.setData({ - 'personInfo.avatarUrl': url - }) - - }, - fail: function (uploadError) { - // 上传失败，处理错误 - console.error(uploadError); - } - }); - if (size <= 10485760) { - resolve(path); - } else { - reject({ - errMsg: '图片大小超出限制，请重新上传' - }); - } - }, - fail: (err) => reject(err), - }); - }); - Toast({ - context: this, - selector: '#t-toast', - message: `头像上传成功`, - theme: 'success', - }) - } catch (error) { - if (error.errMsg === 'chooseImage:fail cancel') return; - Toast({ - context: this, - selector: '#t-toast', - message: error.errMsg || error.msg || '修改头像出错了', - theme: 'error', - }); - } - }, -}); \ No newline at end of file diff --git a/pages/usercenter/person-info/index.json b/pages/usercenter/person-info/index.json deleted file mode 100644 index cac8792..0000000 --- a/pages/usercenter/person-info/index.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "navigationBarTitleText": "个人资料", - "usingComponents": { - "t-cell-group": "tdesign-miniprogram/cell-group/cell-group", - "t-cell": "tdesign-miniprogram/cell/cell", - "t-button": "tdesign-miniprogram/button/button", - "t-image": "/components/webp-image/index", - "t-dialog": "tdesign-miniprogram/dialog/dialog", - "t-toast": "tdesign-miniprogram/toast/toast", - "t-select-picker": "../components/ui-select-picker/index", - "t-upload": "tdesign-miniprogram/upload/upload", - "t-avatar": "tdesign-miniprogram/avatar/avatar", - "t-input": "tdesign-miniprogram/input/input" - } -} \ No newline at end of file diff --git a/pages/usercenter/person-info/index.wxml b/pages/usercenter/person-info/index.wxml deleted file mode 100644 index 8eac863..0000000 --- a/pages/usercenter/person-info/index.wxml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - 保存 - - - diff --git a/pages/usercenter/person-info/index.wxss b/pages/usercenter/person-info/index.wxss deleted file mode 100644 index 5975adc..0000000 --- a/pages/usercenter/person-info/index.wxss +++ /dev/null @@ -1,54 +0,0 @@ -:host { - background-color: #f5f5f5; -} -page view { - box-sizing: border-box; -} -.person-info { - padding-top: 20rpx; -} - -.person-info__btn { - width: 100%; - color: white; - border: 2rpx solid #ddd; - border-radius: 48rpx; - padding: 18rpx 0; - display: flex; - align-self: center; - justify-content: center; -} -.person-info__wrapper { - width: 100%; - padding: 0 32rpx; - padding-bottom: calc(env(safe-area-inset-bottom) + 20rpx); - margin-top: 100rpx; - /* position: absolute; */ - /* bottom: 0; */ - /* left: 0; */ -} - -.avatarUrl { - width: 80rpx; - height: 80rpx; - border-radius: 50% !important; - overflow: hidden; -} - -.t-class-confirm { - color: #fa550f !important; -} - -.person-info .order-group__left { - margin-right: 0; -} -.person-info .t-cell-class { - height: 112rpx; -} - -.user-center-card__header__avatar { - width: 96rpx; - height: 96rpx; - border-radius: 48rpx; - overflow: hidden; -} \ No newline at end of file diff --git a/pages/usercenter/set/index.js b/pages/usercenter/set/index.js deleted file mode 100644 index 845a973..0000000 --- a/pages/usercenter/set/index.js +++ /dev/null @@ -1,88 +0,0 @@ -// pages/usercenter/set/index.js -import { logout } from '~/services/usercenter/set/logout'; -import { getPlatformSpecList } from '~/services/usercenter/set/getPlatformSpecList'; - -Page({ - - /** - * 页面的初始数据 - */ - data: { - platformSpecList: [] - }, - - //协议点击 - onClickCell(data){ - wx.navigateTo({ - url: '/pages/login/agree-link/index?guid=' + data.currentTarget.dataset.guid - }); - }, - - - /** 登出 */ - logOut(){ - logout(); - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - getPlatformSpecList().then((res) => { - if(res.code === 200){ - this.setData({ - platformSpecList: res.data - }) - } - }) - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - - } -}) \ No newline at end of file diff --git a/pages/usercenter/set/index.json b/pages/usercenter/set/index.json deleted file mode 100644 index fbdcdee..0000000 --- a/pages/usercenter/set/index.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "usingComponents": { - "van-button": "@vant/weapp/button/index", - "t-cell": "tdesign-miniprogram/cell/cell" - }, - "navigationBarTitleText": "设置" -} \ No newline at end of file diff --git a/pages/usercenter/set/index.wxml b/pages/usercenter/set/index.wxml deleted file mode 100644 index 7796eab..0000000 --- a/pages/usercenter/set/index.wxml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - 退出当前账号 - - - diff --git a/pages/usercenter/set/index.wxss b/pages/usercenter/set/index.wxss deleted file mode 100644 index 87dfe35..0000000 --- a/pages/usercenter/set/index.wxss +++ /dev/null @@ -1,11 +0,0 @@ -/* pages/usercenter/set/index.wxss */ - - - - -.log-out-btn-box{ - width:85%; - position: absolute; - bottom: 10%; - left: 8%; -} \ No newline at end of file