diff --git a/app.json b/app.json
index 20db1d4..26496d9 100644
--- a/app.json
+++ b/app.json
@@ -39,7 +39,6 @@
"pages/user/transfer",
"pages/user/transfer1",
"pages/login/login",
- "pages/bangding/bangding",
"pages/notice/notice",
"pages/notice/index",
"pages/live/index",
@@ -51,7 +50,9 @@
"pages/shop/shop",
"pages/store/store",
"pages/order/payment",
- "pages/store/myStore"
+ "pages/store/myStore",
+ "pages/userinfo/userinfo",
+ "pages/set/password"
],
"window": {
"backgroundTextStyle": "light",
diff --git a/images/core/fxcp.png b/images/core/fxcp.png
deleted file mode 100644
index b15d12d..0000000
Binary files a/images/core/fxcp.png and /dev/null differ
diff --git a/images/core/fxmx.png b/images/core/fxmx.png
deleted file mode 100644
index d49e4a4..0000000
Binary files a/images/core/fxmx.png and /dev/null differ
diff --git a/images/core/icon1.png b/images/core/icon1.png
deleted file mode 100644
index 1b77bfb..0000000
Binary files a/images/core/icon1.png and /dev/null differ
diff --git a/images/core/qiu.png b/images/core/qiu.png
deleted file mode 100644
index ef9aa18..0000000
Binary files a/images/core/qiu.png and /dev/null differ
diff --git a/images/core/tgewm.png b/images/core/tgewm.png
deleted file mode 100644
index 30edae9..0000000
Binary files a/images/core/tgewm.png and /dev/null differ
diff --git a/images/core/wddd.png b/images/core/wddd.png
deleted file mode 100644
index 278c687..0000000
Binary files a/images/core/wddd.png and /dev/null differ
diff --git a/images/core/wdtd.png b/images/core/wdtd.png
deleted file mode 100644
index 145bbe8..0000000
Binary files a/images/core/wdtd.png and /dev/null differ
diff --git a/images/icons/dz.png b/images/icons/dz.png
index 25bd9ff..3c838c7 100644
Binary files a/images/icons/dz.png and b/images/icons/dz.png differ
diff --git a/images/icons/gg.png b/images/icons/gg.png
deleted file mode 100644
index 47d49d1..0000000
Binary files a/images/icons/gg.png and /dev/null differ
diff --git a/images/icons/grzl.png b/images/icons/grzl.png
new file mode 100644
index 0000000..d84b4a5
Binary files /dev/null and b/images/icons/grzl.png differ
diff --git a/images/icons/icon-user-bangding.png b/images/icons/icon-user-bangding.png
deleted file mode 100644
index a4fd2a7..0000000
Binary files a/images/icons/icon-user-bangding.png and /dev/null differ
diff --git a/images/icons/sz.png b/images/icons/sz.png
deleted file mode 100644
index bbf7c5d..0000000
Binary files a/images/icons/sz.png and /dev/null differ
diff --git a/images/icons/wdsc.png b/images/icons/wdsc.png
index fb7e0f8..d05128f 100644
Binary files a/images/icons/wdsc.png and b/images/icons/wdsc.png differ
diff --git a/images/icons/zj.png b/images/icons/zj.png
index 883a594..72deac9 100644
Binary files a/images/icons/zj.png and b/images/icons/zj.png differ
diff --git a/images/shc.png b/images/shc.png
deleted file mode 100644
index 6f085ba..0000000
Binary files a/images/shc.png and /dev/null differ
diff --git a/images/shced.png b/images/shced.png
deleted file mode 100644
index 0bbc59d..0000000
Binary files a/images/shced.png and /dev/null differ
diff --git a/pages/bangding/bangding.js b/pages/bangding/bangding.js
deleted file mode 100644
index 5f874d7..0000000
--- a/pages/bangding/bangding.js
+++ /dev/null
@@ -1,260 +0,0 @@
-var app = getApp();
-var WXAPI = require('../../utils/server.js');
-function getNowFormatDate() {
- var date = new Date();
- var seperator1 = "-";
- var year = date.getFullYear();
- var month = date.getMonth() + 1;
- var strDate = date.getDate();
- if (month >= 1 && month <= 9) {
- month = "0" + month;
- }
- if (strDate >= 0 && strDate <= 9) {
- strDate = "0" + strDate;
- }
- var currentdate = year + seperator1 + month + seperator1 + strDate;
- return currentdate;
-};
-Page({
- /**
- * 页面的初始数据
- */
- data: {
- inp_money: 0,
- iv: '',
- encryptedData: '',
- islogin: false,
- remind: '加载中',
- bank_name: '',
- binding: false,
- multiIndex: [0, 0, 0],
- date: '2020-07-01',
- time: '12:01',
- region: ['湖南省', '长沙市', '岳麓区'],
- customItem: '全部',
- items: [
- { name: '1', value: '男', checked: true },
- { name: '2', value: '女', checked: false },
- ],
- sex: 1
- },
- //页面加载完成函数
- onReady: function () {
-
- },
- radioChange: function (e) {
- var items = this.data.items;
- for (var i = 0; i < items.length; i++) {
- if (items[i].name == e.detail.value) {
- items[i].checked = true;
- } else {
- items[i].checked = false;
- }
- }
- this.setData({
- items: items,
- sex: e.detail.value
- })
-
- },
- bindPickerChange: function (e) {
- console.log('picker发送选择改变，携带值为', e.detail.value)
- this.setData({
- index: e.detail.value
- })
- },
- bindMultiPickerChange: function (e) {
- console.log('picker发送选择改变，携带值为', e.detail.value)
- this.setData({
- multiIndex: e.detail.value
- })
- },
- bindDateChange: function (e) {
- console.log('picker发送选择改变，携带值为', e.detail.value)
- this.setData({
- date: e.detail.value
- })
- },
- bindTimeChange: function (e) {
- console.log('picker发送选择改变，携带值为', e.detail.value)
- this.setData({
- time: e.detail.value
- })
- },
- bindRegionChange: function (e) {
- console.log('picker发送选择改变，携带值为', e.detail.value)
- this.setData({
- region: e.detail.value
- })
- },
- /**
- * 生命周期函数--监听页面加载
- */
-
- onLoad: function () {
- wx.checkSession({
- success: function (e) {
- app.globalData.userInfo['session_key'] = app.globalData.userInfo.session_key;
- },
- fail: function () {
- wx.login({
- success: function (res) {
- var code = res.code;
- that.globalData.code = res.code;
- //取出本地存储用户信息，解决需要每次进入小程序弹框获取用户信息
- var userinfo = wx.getStorageSync('userInfo');
- that.globalData.userInfo = userinfo;
- app.getUserSessionKey(code, cb);
- }
- }); //重新登录
- }
- });
- var date = getNowFormatDate();
- console.log(date)
- this.setData({
- bgcolor: app.d.bgcolor,
- date: date
- });
- var that = this;
- WXAPI.userPerfectIndex({
- user_id: app.globalData.userInfo.user_id
- }).then(res => {
- if (res.code == 200) {
- var data = res;
-
- var items = that.data.items;
- for (var i = 0; i < items.length; i++) {
- if (items[i].name == data.sex) {
- items[i].checked = true;
- } else {
- items[i].checked = false;
- }
- }
- if (data.province) {
- var region = [data.province, data.city, data.county];
- } else {
- var region = that.data.region;
- }
- if (data.birthday) {
- var date = data.birthday
- } else {
- var date = that.data.date;
- }
-
- that.setData({
- name: data.name,
- mobile: data.mobile,
- binding: data.binding,
- items: items,
- region: region,
- date: date,
- wx_id: data.wechat_id,
- sex: data.sex,
- remind: ''
- });
- }
- });
- },
- renewal: function (e) {
- var that = this;
- that.setData({
- binding: !that.data.binding
- })
- },
- // 获取手机号码
- getPhoneNumber: function (e) {
- var res_d = e;
- var iv = e.detail.iv;
- var encryptedData = e.detail.encryptedData;
- var that = this;
- if (e.detail.errMsg == 'getPhoneNumber:fail user deny') {
- wx.showModal({
- title: '提示',
- showCancel: false,
- content: '未授权',
- success: function (res) { }
- })
- } else {
- wx.showModal({
- title: '提示',
- showCancel: false,
- content: '同意授权',
- success: function (res) {
- WXAPI.userSecretKey({
- encryptedData: encryptedData, // 加密数据
- iv: iv, // 加密算法
- sessionId: app.globalData.userInfo.session_key
- }).then(res => {
- if (res.code == 200) {
- var data = res;
- that.setData({
- islogin: true,
- mobile: data.info
- })
- } else {
- app.getUserInfo(that, res_d);
- }
- });
- }
- })
- }
- },
- // 获取信息
- perfect: function (res) {
- console.log(res)
- var that = this;
- var region = this.data.region;
-
- for (var i = 0; i < region.length; i++) {
- if (region[i] == '全部') {
- wx.showToast({
- title: '请完善地址!',
- icon: 'none',
- duration: 1500
- })
- return false;
- break;
- }
- }
- var sex = that.data.sex;
- var province = region[0], city = region[1], county = region[2];
- if (res.detail.value.name.length == 0) {
- wx.showToast({
- title: '姓名不得为空!',
- icon: 'loading',
- duration: 1500
- })
- wx.hideToast()
- } else {
- WXAPI.userPerfect({
- user_id: app.globalData.userInfo.user_id,
- name: res.detail.value.name,
- mobile: that.data.mobile,
- province: province,
- city: city,
- county: county,
- wx_id: res.detail.value.wx_id,
- sex: sex,
- date: that.data.date,
- }).then(res => {
- if (res.code == 200) {
- var data = res;
- wx.showToast({
- title: res.message,
- icon: 'success',
- duration: 3000
- })
- } else {
- wx.showToast({
- title: res.message ? res.message : '非法操作！',
- icon: 'none',
- duration: 1500
- });
- }
- wx.navigateBack({
- delta: 1
- });
- });
- }
- },
-})
\ No newline at end of file
diff --git a/pages/bangding/bangding.json b/pages/bangding/bangding.json
deleted file mode 100644
index 60b180f..0000000
--- a/pages/bangding/bangding.json
+++ /dev/null
@@ -1 +0,0 @@
-{"navigationBarTitleText":"完善信息"}
\ No newline at end of file
diff --git a/pages/bangding/bangding.wxml b/pages/bangding/bangding.wxml
deleted file mode 100644
index f6c7ccb..0000000
--- a/pages/bangding/bangding.wxml
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 已绑定手机
- {{mobile}}
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/bangding/bangding.wxss b/pages/bangding/bangding.wxss
deleted file mode 100644
index d065609..0000000
--- a/pages/bangding/bangding.wxss
+++ /dev/null
@@ -1,118 +0,0 @@
-page{
- background-color: rgb(240, 239, 245);
-}
-.page{
- background-color:#fff;
- margin-bottom:30px;
-}
-
-radio .wx-radio-input.wx-radio-input-checked{
- border: none;
- background-color: #FF6347;
-}
-radio .wx-checkbox-input.wx-checkbox-input-checked{
- background-color: #FF6347
-}
-
-
-.dpxzq{
- color:#666;
- background-color:rgb(240, 239, 245);
- padding:3px;
- border-radius:10rpx;
- margin-right:10px;
-}
-.balance{
- text-align: center;
- padding:10px 20px;
- font-size: 18px;
-}
-.bb{
- text-align: center;
- font-size: 12px;
-}
-.Withdraw{
- padding: 10px 20px;
-}
-
-.cash{
- border: 1px solid #ddd;
- flex: 1;
- margin-left: -1px;
- font-size: 12px;
- padding: 0 10px;
- line-height: 30px;
- height: 30px;
-}
-
-.tx{
- background-color: #48474c;
- color: #fff;
- text-align: center;
- height: 45px;
- line-height: 45px;
- width: 345px;
- border-radius:30px;
-}
-.Phone{
- font-size:28rpx;
- width:70%;
- padding-left:2%;
- display:flex;
- align-items:center;
-}
-
-.section{
- padding: 12px 0;
- width: 100%;
- display:flex;
- flex-direction:row;
- font-size: 16px;
- /* justify-content: center; */
-}
-.inp{
- display:flex;
- align-items:center;
- width: 70%;
- margin-top:2px;
-
-}
-.t_3{
- margin-left: 15px;
- font-size:13px;
-}
-.text{
- width: 27%;
- text-align:center;
- display:flex;
- align-items:center;
-}
-.xt{
- height:1px;
- width:87%;
- background:#eee;
- margin:auto;
-
-}
-.sj_btn{
- background:#FF6347;
- color:#fff;
- font-size:26rpx;
-}
-
-.binding-header{ height:88rpx; background: #ffffff; }
-.empower{ color:#353535; font-size:13px; width:50%; height:100%; display: flex; justify-content: center; align-items: center; }
-.binding-phone{ height:100%; width:38%; display: flex; justify-content: center; align-items: center; }
-.binding-main{ height:100rpx; background: #ffffff; margin-bottom: 80rpx; }
-.binding-main2{ height:200rpx; background: #ffffff; margin-bottom: 80rpx; }
-.binding-btn{ height:56rpx; margin:20rpx 40rpx 0rpx 40rpx; font-size: 13px; border-radius: 0rpx; background: #ffffff; display: flex; justify-content: center; align-items: center; }
-wx-button[class="binding-btn"]::after { border: 0; }
-.input-placeholder{ color:#c9c9c9; }
-.binding-btn.active{ color:#353535; }
-.binding-footer{ height:88rpx; background: #ff4544; border-radius: 44rpx; margin:0rpx 24rpx; display: flex; justify-content: center; align-items: center; color:#ffffff; font-size: 15px; }
-.binding-phone.gainPhone{ border-bottom:4rpx solid #ff4544; }
-.binding-phone.handPhone{ border-bottom:4rpx solid #ff4544; }
-.binding_pic{ height:288rpx; margin: 64rpx 0rpx 56rpx 0rpx; display: flex; justify-content: center; }
-.binding_num{ margin-bottom: 64rpx; }
-
-
diff --git a/pages/cart/cart.js b/pages/cart/cart.js
index d6cf20b..defa9eb 100644
--- a/pages/cart/cart.js
+++ b/pages/cart/cart.js
@@ -89,7 +89,6 @@ Page({
accessId: app.globalData.accessId,
storeId: 239,
storeType: 1,
- user_id: that.data.user_id,
}).then(res => {
if (res.code == 200) {
wx.showToast({
diff --git a/pages/cart/cart.wxml b/pages/cart/cart.wxml
index 93c1ae9..2cdabdc 100644
--- a/pages/cart/cart.wxml
+++ b/pages/cart/cart.wxml
@@ -54,14 +54,13 @@
去逛逛
-
+
-
diff --git a/pages/set/password.js b/pages/set/password.js
new file mode 100644
index 0000000..2d86adc
--- /dev/null
+++ b/pages/set/password.js
@@ -0,0 +1,92 @@
+// pages/set/password.js
+var app = getApp()
+var WXAPI = require('../../utils/server.js');
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+ confirm() {
+ WXAPI.updatepassword({
+ accessId: app.globalData.accessId,
+ storeId: 239,
+ storeType: 1,
+ password: '',
+ newPwd: '',
+ confirm: '',
+ }).then(res => {
+ if (res.code == 200) {
+ wx.showToast({
+ icon: 'loading',
+ title: '修改成功',
+ duration: 2000
+ });
+ wx.navigateBack()
+ } else {
+ wx.showToast({
+ icon: 'loading',
+ title: res.message,
+ duration: 2000
+ });
+ }
+ })
+ },
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/set/password.json b/pages/set/password.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/set/password.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/set/password.wxml b/pages/set/password.wxml
new file mode 100644
index 0000000..5850559
--- /dev/null
+++ b/pages/set/password.wxml
@@ -0,0 +1,2 @@
+
+pages/set/password.wxml
diff --git a/pages/set/password.wxss b/pages/set/password.wxss
new file mode 100644
index 0000000..a1b327b
--- /dev/null
+++ b/pages/set/password.wxss
@@ -0,0 +1 @@
+/* pages/set/password.wxss */
\ No newline at end of file
diff --git a/pages/set/set.js b/pages/set/set.js
index 853a9a7..26583a8 100644
--- a/pages/set/set.js
+++ b/pages/set/set.js
@@ -115,8 +115,12 @@ Page({
onReachBottom: function () {
},
-
-
+ changePwd: function () {
+ wx.navigateTo({
+ url: '/pages/set/password'
+ })
+ },
+
update: function () {
wx.getUserInfo({
success: function (res) {
diff --git a/pages/user/user.js b/pages/user/user.js
index 493724f..3780171 100644
--- a/pages/user/user.js
+++ b/pages/user/user.js
@@ -11,11 +11,6 @@ Page({
navBarHeight: wx.getStorageSync('statusBarHeight') + wx.getStorageSync('navBarHeight') + 'px',
pop: null,
list: [
- // {
- // icon: 'icon-user-bangding.png',
- // text: '完善资料',
- // url: 'bangding/bangding'
- // },
{
icon: 'wdsc.png',
text: '我的收藏',
@@ -31,11 +26,11 @@ Page({
text: '地址管理',
url: 'address/index'
},
- // {
- // icon: 'sz.png',
- // text: '设置',
- // url: 'set/set'
- // }
+ {
+ icon: 'grzl.png',
+ text: '个人资料',
+ url: 'userinfo/userinfo'
+ }
],
cont: 1,
remind: '加载中',
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index e7a63a0..6920eb8 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -130,7 +130,7 @@
-
+
{{item.subtitle_name}}
diff --git a/pages/user/user.wxss b/pages/user/user.wxss
index 358ab56..34474b0 100644
--- a/pages/user/user.wxss
+++ b/pages/user/user.wxss
@@ -158,7 +158,7 @@ border-radius:5px;
color:#fff;
background:red;
border-radius:50%;
- right:15px;
+ right:12px;
top:8px;
font-size:12px;
width:38rpx;
@@ -170,14 +170,14 @@ border-radius:5px;
.function_left{
display: flex;
font-size:16px;
- margin-left:5px;
+ margin-left:18rpx;
/* padding-top: 3px; */
}
.function .iconfont {
line-height:27px;
}
.function_text{
- margin-left:5px;
+ margin-left:10px;
}
.hh{
margin:10px auto;
diff --git a/pages/user/wallet.wxss b/pages/user/wallet.wxss
index 1e015f3..87f71db 100644
--- a/pages/user/wallet.wxss
+++ b/pages/user/wallet.wxss
@@ -95,9 +95,6 @@ contact-button{
display:flex;
flex-direction:column;
}
-.hh{
- /* margin-top: 15px; */
-}
.dibu{
background-color: #48474c;
width: 100%;
@@ -197,11 +194,6 @@ contact-button{
font-size:28rpx;
font-weight:bold;
}
-.obtain_bt_3{
-}
-
-
-
@keyframes rise{
0% {opacity: 0;transform: translate3d(0,100%,0);}
50% {opacity: 1;}
diff --git a/pages/userinfo/userinfo.js b/pages/userinfo/userinfo.js
new file mode 100644
index 0000000..b0aa8b9
--- /dev/null
+++ b/pages/userinfo/userinfo.js
@@ -0,0 +1,94 @@
+// pages/userinfo/userinfo.js
+var app = getApp()
+var WXAPI = require('../../utils/server.js');
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ user: {},
+ company: {},
+ gender: '',
+ },
+ requestMyData: function () {
+ var that = this;
+ WXAPI.userIndex({
+ accessId: app.globalData.accessId,
+ storeId: 239,
+ storeType: 1,
+ mobile:'',
+ }).then(res => {
+ if (res.code == 200) {
+ var data = res.data;
+ if (data.data) {
+ that.setData({
+ user: data.data.user,
+ company: data.data.company,
+ gender: data.data.user.sex==0?'女':'男'
+ });
+ }
+ } else {
+ wx.showToast({
+ title: '访问失败！',
+ duration: 2000
+ });
+ }
+ });
+ },
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+ this.requestMyData();
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/userinfo/userinfo.json b/pages/userinfo/userinfo.json
new file mode 100644
index 0000000..cbc2781
--- /dev/null
+++ b/pages/userinfo/userinfo.json
@@ -0,0 +1,4 @@
+{
+ "usingComponents": {},
+ "navigationBarTitleText": "个人资料"
+}
\ No newline at end of file
diff --git a/pages/userinfo/userinfo.wxml b/pages/userinfo/userinfo.wxml
new file mode 100644
index 0000000..8ceaa28
--- /dev/null
+++ b/pages/userinfo/userinfo.wxml
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+ 个人资料
+
+
+
+ 用户头像
+
+
+
+ 昵称
+ {{user.user_name}}
+
+
+ 性别
+ {{gender}}
+
+
+ 手机号码
+ {{user.mobile}}
+
+
+ 出生日期
+ {{user.birthday}}
+
+
+
+
+
+ 公司资料
+
+
+
+ 名称
+ {{company.image}}
+
+
+ 地址
+ {{company.image}}
+
+
+ 营业执照
+
+
+
+ 开户行信息
+ {{company.image}}
+
+
+ 纳税人识别号
+ {{company.image}}
+
+
+ 联系人(法人)
+ {{company.image}}
+
+
+ 联系方式
+ {{company.image}}
+
+
+
+
+
+
+
+
diff --git a/pages/userinfo/userinfo.wxss b/pages/userinfo/userinfo.wxss
new file mode 100644
index 0000000..19ad4d0
--- /dev/null
+++ b/pages/userinfo/userinfo.wxss
@@ -0,0 +1,166 @@
+/* pages/userinfo/userinfo.wxss */
+page{
+ background-color: #F6F6FB;
+}
+.container{
+ font-size: 30rpx;
+ /* height: 100vh;
+ overflow-x: hidden;
+ overflow-y: auto; */
+}
+.topbg {
+ position: absolute;
+ top: 0;
+ left: 0;
+ height: 90rpx;
+ width: 100%;
+ z-index: -1;
+ background: linear-gradient(to top, #F6F6FA, #C0DEFA);
+}
+.titleModule{
+ display: flex;
+ flex-direction: row;
+ height: 90rpx;
+}
+.titleModule .titleTag{
+ margin-left: 30rpx;
+ margin-top: 31rpx;
+ height: 28rpx;
+ width: 8rpx;
+ background-color: #DF1111;
+}
+.titleModule .title{
+ margin-left: 10rpx;
+ height: 90rpx;
+ font-size: 32rpx;
+ line-height: 90rpx;
+ color: #333333;
+}
+.fillcolor{
+ background-color: #F6F6FB;
+}
+.headModule{
+ display: flex;
+ flex-direction: row;
+ height: 180rpx;
+ background-color: white;
+ border-bottom: 1rpx solid #ececec;
+}
+.headModule .title{
+ margin-left: 30rpx;
+ font-size: 28rpx;
+ width: 180rpx;
+ height: 90rpx;
+ line-height: 90rpx;
+ color: #333333;
+}
+.headModule .head_image {
+ margin-top: 30rpx;
+ margin-left: 60rpx;
+ width: 120rpx;
+ height: 120rpx;
+ border-radius: 50%;
+}
+.cellModule{
+ display: flex;
+ flex-direction: row;
+ height: 90rpx;
+ background-color: white;
+ border-bottom: 1rpx solid #ececec;
+}
+.cellModule .title{
+ margin-left: 30rpx;
+ font-size: 28rpx;
+ width: 180rpx;
+ height: 90rpx;
+ line-height: 90rpx;
+ color: #333333;
+}
+.large{
+ height: 220rpx;
+}
+.cellModule .scrollView{
+ margin-top: 30rpx;
+ margin-left: 80rpx;
+ width: 500rpx;
+ height: 160rpx;
+ white-space: nowrap;
+ display: inline-block;
+}
+.cellModule .cell_image {
+ margin-top: 30rpx;
+ margin-left: 60rpx;
+ width: 160rpx;
+ height: 160rpx;
+}
+.areaModule{
+ display: flex;
+ flex-direction: row;
+ min-height: 90rpx;
+ background-color: white;
+ border-bottom: 1rpx solid #ececec;
+}
+.areaModule .title{
+ margin-left: 30rpx;
+ font-size: 28rpx;
+ width: 180rpx;
+ height: 90rpx;
+ line-height: 90rpx;
+ color: #333333;
+}
+.areaModule text{
+ padding-top: 25rpx;
+ margin-left: 60rpx;
+ padding-bottom: 25rpx;
+ width: 435rpx;
+ font-size: 28rpx;
+ color: #807e7e;
+}
+.submitView{
+ margin-top: 40rpx;
+ height: 80rpx;
+ background-color: #F6F6FB;
+ display: flex;
+ flex-direction: row;
+ /* iPhoneX底部适配 */
+ padding-bottom: env(safe-area-inset-bottom);
+}
+.submitView .sendBtn{
+ margin-top: 5rpx;
+ margin-left: 30rpx;
+ height: 70rpx;
+ width: 330rpx;
+ text-align: center;
+ line-height: 70rpx;
+ font-size: 28rpx;
+ color: #1A66FF;
+ background-color: #E7EEFE;
+ border-radius: 8rpx;
+}
+/* .submitView .submitBtn{
+ margin-top: 5rpx;
+ margin-left: 30rpx;
+ height: 70rpx;
+ width: 330rpx;
+ text-align: center;
+ line-height: 70rpx;
+ font-size: 28rpx;
+ color: white;
+ background-color: #1A66FF;
+ border-radius: 8rpx;
+} */
+.submitView .submitBtn{
+ margin-top: 5rpx;
+ margin-left: 60rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ height: 70rpx;
+ width: 630rpx;
+ text-align: center;
+ line-height: 70rpx;
+ font-size: 28rpx;
+ color: white;
+ background-color: #1A66FF;
+ border-radius: 35rpx;
+}
\ No newline at end of file
diff --git a/utils/server.js b/utils/server.js
index d6c06ba..965a625 100644
--- a/utils/server.js
+++ b/utils/server.js
@@ -108,12 +108,16 @@ module.exports = {
return requestServer('app.cart.delcart', 'post', data)
},
productDelAllCart: (data) => { //清空购物车
- return requestServer('app.cart.delAll_cart', 'post', data)
+ return requestServer('app.cart.delAllCart', 'post', data)
},
/* 我的 */
userIndex: (data) => { //个人中心
return requestServer('app.user.index', 'post', data)
},
+ updatepassword: (data) => { //修改密码
+ return requestServer('app.user.updatepassword', 'post', data)
+ },
+ /* 商品 */
mchClass: (data) => { //店铺分类
return requestServer('app.index.mchClass', 'post', data)
},
@@ -193,62 +197,6 @@ module.exports = {
return requestServer('app.message.index', 'post', data)
},
- /* -------------------- */
-
- userMaterial: (data) => { //
- return requestServer('&action=user&app=material', 'post', data)
- },
- indexGetMore: (data) => { //更多
- return requestServer('&action=index&app=get_more', 'post', data)
- },
- // newProduct: (data) => { //新品
- // return requestServer('&action=product&m=new_product', 'post', data)
- // },
- productToCollection: (data) => {
- return requestServer('&action=product&m=to_Collection', 'post', data)
- },
-
- // productShopping: (data) => {
- // return requestServer('&action=product&m=Shopping', 'post', data)
- // },
-
- preservation: (data) => {
- return requestServer('&action=user&m=Preservation', 'post', data)
- },
- addressDelselect: (data) => {
- return requestServer('&action=address&m=del_select', 'post', data)
- },
-
- addressSetDefault: (data) => { //设置默认地址
- return requestServer('&action=address&m=set_default', 'post', data)
- },
-
- addressUpAddsIndex: (data) => { //修改地址
- return requestServer('&action=address&m=up_addsindex', 'post', data)
- },
-
- envelopeIndex: (data) => { //
- return requestServer('&action=envelope&m=index', 'post', data)
- },
- envelopeShare: (data) => { //
- return requestServer('&action=envelope&m=share', 'post', data)
- },
- appUser: (data) => { //
- return requestServer('&action=app&m=user', 'post', data)
- },
- getcodeProductShare: (data) => { //
- return requestServer('&action=getcode&m=product_share', 'post', data)
- },
- userPerfectIndex: (data) => { //
- return requestServer('&action=user&m=perfect_index', 'post', data)
- },
- userSecretKey: (data) => { //
- return requestServer('&action=user&m=secret_key', 'post', data)
- },
- userPerfect: (data) => { //
- return requestServer('&action=user&m=perfect', 'post', data)
- },
-
}
\ No newline at end of file