Skip to content

A
aimeiyue-xcx-store
Commit 9fd2dd22 by xnn
Options

修复已知问题

parent af9c0554
Showing with 175 additions and 23 deletions
ddy/pages/login/login.vue
...@@ -19,10 +19,34 @@ ...@@ -19,10 +19,34 @@
<u-line></u-line> <u-line></u-line>
</view> </view>
<u-toast ref="uToast"></u-toast> <u-toast ref="uToast"></u-toast>
<u-picker :show="show" :columns="columns" @confirm="confirm"></u-picker> <u-picker :show="show" :columns="columns" @cancel="show = false" closeOnClickOverlay="true"
@confirm="confirm"></u-picker>
<view @click="userLogin" class="loginBtn"> <view @click="userLogin" class="loginBtn">
登录 登录
</view> </view>
<u-popup :show="xyshow" @close="close" :round="10" mode="center" @open="open">
<view class="xieyi">
<view class="xyTitle">
用户使用须知
</view>
<view class="xyContant">
使用前，请您仔细阅读<text style="color: cornflowerblue;" @click="xieyi">《用户服务协议》</text>及<text
style="color: cornflowerblue;" @click="yinsi">《隐私政策》</text>
</view>
<view class="btnList">
<view class="btnleft">
<view class="btn" @click="xyshow = false">
不同意
</view>
</view>
<view class="btnright">
<view class="btn" @click="xyshow = false">
同意
</view>
</view>
</view>
</view>
</u-popup>
</view> </view>
</template> </template>
...@@ -30,6 +54,7 @@ ...@@ -30,6 +54,7 @@
export default { export default {
data() { data() {
return { return {
xyshow: true,
show: false, show: false,
userName: '', userName: '',
passWord: '', passWord: '',
...@@ -44,6 +69,13 @@ ...@@ -44,6 +69,13 @@
console.log("未登录") console.log("未登录")
}, },
methods: { methods: {
open() {
// console.log('open');
},
close() {
this.show = false
// console.log('close');
},
confirm(e) { confirm(e) {
console.log(e.value) console.log(e.value)
if (e.value[0] == '商家') { if (e.value[0] == '商家') {
...@@ -161,4 +193,49 @@ ...@@ -161,4 +193,49 @@
border-radius: 90rpx; border-radius: 90rpx;
} }
.xieyi {
width: 600rpx;
height: 400rpx;
background-color: #FFFFFF;
border-radius: 20rpx;
}
.xyTitle {
text-align: center;
font-size: 40rpx;
font-weight: 600;
margin-top: 50rpx;
}
.xyContant {
margin: 50rpx 30rpx;
font-size: 30rpx;
}
.btnList {
width: 100%;
display: flex;
justify-content: space-around;
align-items: center;
text-align: center;
line-height: 80rpx;
// margin-bottom: 50rpx;
}
.btnleft {
width: 260rpx;
height: 80rpx;
border-radius: 40rpx;
color: #D3195E;
border: 1rpx solid #D3195E;
}
.btnright {
width: 260rpx;
height: 80rpx;
border-radius: 40rpx;
background-color: #D3195E;
color: #FFFFFF;
}
</style> </style>
\ No newline at end of file
ddy/pages/my/my.vue
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
this.myCellList = [{ this.myCellList = [{
"pagePath": "/pageSub/pages/balance/balance", "pagePath": "/pageSub/pages/balance/balance",
"iconName": "http://amy.yyinhong.cn/uploads/wximg/pc_wdye.png", "iconName": "http://amy.yyinhong.cn/uploads/wximg/pc_wdye.png",
"text": "我的积分", "text": "我的佣金",
"name": "balance" "name": "balance"
}, },
{ {
......
ddy/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
ddy/unpackage/dist/dev/mp-weixin/common/vendor.js
...@@ -9793,17 +9793,12 @@ var request = function request() { ...@@ -9793,17 +9793,12 @@ var request = function request() {
header: header, header: header,
//自定义头部，和后端商同后编写 //自定义头部，和后端商同后编写
success: function success(res) { success: function success(res) {
console.log(res);
if (res.data.code == 403) { if (res.data.code == 403) {
//自定请求失败的情况，这里以常见的token失效或过期为例 //自定请求失败的情况，这里以常见的token失效或过期为例
uni.removeStorageSync('token'); uni.removeStorageSync('token');
uni.showToast({ uni.reLaunch({
title: "" + res.data.message, url: '/pages/login/login'
icon: 'none',
complete: function complete() {
uni.reLaunch({
url: '/pages/login/login'
});
}
}); });
return; return;
} }
......
ddy/unpackage/dist/dev/mp-weixin/pages/login/login.js
...@@ -115,6 +115,9 @@ try { ...@@ -115,6 +115,9 @@ try {
uPicker: function () { uPicker: function () {
return Promise.all(/*! import() | node-modules/uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-picker/u-picker.vue */ 310)) return Promise.all(/*! import() | node-modules/uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-picker/u-picker.vue */ 310))
}, },
uPopup: function () {
return Promise.all(/*! import() | node-modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-popup/u-popup.vue */ 447))
},
} }
} catch (e) { } catch (e) {
if ( if (
...@@ -141,6 +144,15 @@ var render = function () { ...@@ -141,6 +144,15 @@ var render = function () {
_vm.e0 = function ($event) { _vm.e0 = function ($event) {
_vm.show = true _vm.show = true
} }
_vm.e1 = function ($event) {
_vm.show = false
}
_vm.e2 = function ($event) {
_vm.xyshow = false
}
_vm.e3 = function ($event) {
_vm.xyshow = false
}
} }
} }
var recyclableRender = false var recyclableRender = false
...@@ -209,9 +221,34 @@ exports.default = void 0; ...@@ -209,9 +221,34 @@ exports.default = void 0;
// //
// //
// //
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
var _default = { var _default = {
data: function data() { data: function data() {
return { return {
xyshow: true,
show: false, show: false,
userName: '', userName: '',
passWord: '', passWord: '',
...@@ -224,6 +261,13 @@ var _default = { ...@@ -224,6 +261,13 @@ var _default = {
console.log("未登录"); console.log("未登录");
}, },
methods: { methods: {
open: function open() {
// console.log('open');
},
close: function close() {
this.show = false;
// console.log('close');
},
confirm: function confirm(e) { confirm: function confirm(e) {
console.log(e.value); console.log(e.value);
if (e.value[0] == '商家') { if (e.value[0] == '商家') {
......
ddy/unpackage/dist/dev/mp-weixin/pages/login/login.json
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
"u-line": "/node-modules/uview-ui/components/u-line/u-line", "u-line": "/node-modules/uview-ui/components/u-line/u-line",
"u--input": "/node-modules/uview-ui/components/u--input/u--input", "u--input": "/node-modules/uview-ui/components/u--input/u--input",
"u-toast": "/node-modules/uview-ui/components/u-toast/u-toast", "u-toast": "/node-modules/uview-ui/components/u-toast/u-toast",
"u-picker": "/node-modules/uview-ui/components/u-picker/u-picker" "u-picker": "/node-modules/uview-ui/components/u-picker/u-picker",
"u-popup": "/node-modules/uview-ui/components/u-popup/u-popup"
} }
} }
\ No newline at end of file
ddy/unpackage/dist/dev/mp-weixin/pages/login/login.wxml
<view class="pageContent"><view class="loginModel"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="loginTitle" bindtap="__e">{{''+user_typename+'登录'}}<u-icon style="margin-left:40rpx;" vue-id="35a7246c-1" name="list-dot" color="#000" size="28" bind:__l="__l"></u-icon></view><u-line vue-id="35a7246c-2" bind:__l="__l"></u-line><view class="loginInput"><u--input bind:input="__e" vue-id="35a7246c-3" prefixIcon="account-fill" fontSize="20" prefixIconStyle="font-size: 60rpx;color: #333333" placeholderClass="place-class" placeholder="账号" border="bottom" clearable="{{true}}" value="{{userName}}" data-event-opts="{{[['^input',[['__set_model',['','userName','$event',[]]]]]]}}" bind:__l="__l"></u--input></view><u-line vue-id="35a7246c-4" bind:__l="__l"></u-line><view class="loginInput"><u--input bind:input="__e" vue-id="35a7246c-5" prefixIcon="lock-fill" fontSize="20" password="{{true}}" type="password" prefixIconStyle="font-size: 60rpx;color: #333333" placeholderClass="place-class" placeholder="密码" border="bottom" clearable="{{true}}" value="{{passWord}}" data-event-opts="{{[['^input',[['__set_model',['','passWord','$event',[]]]]]]}}" bind:__l="__l"></u--input></view><u-line vue-id="35a7246c-6" bind:__l="__l"></u-line></view><u-toast class="vue-ref" vue-id="35a7246c-7" data-ref="uToast" bind:__l="__l"></u-toast><u-picker vue-id="35a7246c-8" show="{{show}}" columns="{{columns}}" data-event-opts="{{[['^confirm',[['confirm']]]]}}" bind:confirm="__e" bind:__l="__l"></u-picker><view data-event-opts="{{[['tap',[['userLogin',['$event']]]]]}}" class="loginBtn" bindtap="__e">登录</view></view> <view class="pageContent"><view class="loginModel"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="loginTitle" bindtap="__e">{{''+user_typename+'登录'}}<u-icon style="margin-left:40rpx;" vue-id="35a7246c-1" name="list-dot" color="#000" size="28" bind:__l="__l"></u-icon></view><u-line vue-id="35a7246c-2" bind:__l="__l"></u-line><view class="loginInput"><u--input bind:input="__e" vue-id="35a7246c-3" prefixIcon="account-fill" fontSize="20" prefixIconStyle="font-size: 60rpx;color: #333333" placeholderClass="place-class" placeholder="账号" border="bottom" clearable="{{true}}" value="{{userName}}" data-event-opts="{{[['^input',[['__set_model',['','userName','$event',[]]]]]]}}" bind:__l="__l"></u--input></view><u-line vue-id="35a7246c-4" bind:__l="__l"></u-line><view class="loginInput"><u--input bind:input="__e" vue-id="35a7246c-5" prefixIcon="lock-fill" fontSize="20" password="{{true}}" type="password" prefixIconStyle="font-size: 60rpx;color: #333333" placeholderClass="place-class" placeholder="密码" border="bottom" clearable="{{true}}" value="{{passWord}}" data-event-opts="{{[['^input',[['__set_model',['','passWord','$event',[]]]]]]}}" bind:__l="__l"></u--input></view><u-line vue-id="35a7246c-6" bind:__l="__l"></u-line></view><u-toast class="vue-ref" vue-id="35a7246c-7" data-ref="uToast" bind:__l="__l"></u-toast><u-picker vue-id="35a7246c-8" show="{{show}}" columns="{{columns}}" closeOnClickOverlay="true" data-event-opts="{{[['^cancel',[['e1']]],['^confirm',[['confirm']]]]}}" bind:cancel="__e" bind:confirm="__e" bind:__l="__l"></u-picker><view data-event-opts="{{[['tap',[['userLogin',['$event']]]]]}}" class="loginBtn" bindtap="__e">登录</view><u-popup vue-id="35a7246c-9" show="{{xyshow}}" round="{{10}}" mode="center" data-event-opts="{{[['^close',[['close']]],['^open',[['open']]]]}}" bind:close="__e" bind:open="__e" bind:__l="__l" vue-slots="{{['default']}}"><view class="xieyi"><view class="xyTitle">用户使用须知</view><view class="xyContant">使用前，请您仔细阅读<text data-event-opts="{{[['tap',[['xieyi',['$event']]]]]}}" style="color:cornflowerblue;" bindtap="__e">《用户服务协议》</text>及<text data-event-opts="{{[['tap',[['yinsi',['$event']]]]]}}" style="color:cornflowerblue;" bindtap="__e">《隐私政策》</text></view><view class="btnList"><view class="btnleft"><view data-event-opts="{{[['tap',[['e2',['$event']]]]]}}" class="btn" bindtap="__e">不同意</view></view><view class="btnright"><view data-event-opts="{{[['tap',[['e3',['$event']]]]]}}" class="btn" bindtap="__e">同意</view></view></view></view></u-popup></view>
\ No newline at end of file \ No newline at end of file
ddy/unpackage/dist/dev/mp-weixin/pages/login/login.wxss
...@@ -66,3 +66,41 @@ ...@@ -66,3 +66,41 @@
background-color: #D3195E; background-color: #D3195E;
border-radius: 90rpx; border-radius: 90rpx;
} }
.xieyi {
width: 600rpx;
height: 400rpx;
background-color: #FFFFFF;
border-radius: 20rpx;
}
.xyTitle {
text-align: center;
font-size: 40rpx;
font-weight: 600;
margin-top: 50rpx;
}
.xyContant {
margin: 50rpx 30rpx;
font-size: 30rpx;
}
.btnList {
width: 100%;
display: flex;
justify-content: space-around;
align-items: center;
text-align: center;
line-height: 80rpx;
}
.btnleft {
width: 260rpx;
height: 80rpx;
border-radius: 40rpx;
color: #D3195E;
border: 1rpx solid #D3195E;
}
.btnright {
width: 260rpx;
height: 80rpx;
border-radius: 40rpx;
background-color: #D3195E;
color: #FFFFFF;
}
ddy/unpackage/dist/dev/mp-weixin/pages/my/my.js
...@@ -247,7 +247,7 @@ var _default = { ...@@ -247,7 +247,7 @@ var _default = {
_this.myCellList = [{ _this.myCellList = [{
"pagePath": "/pageSub/pages/balance/balance", "pagePath": "/pageSub/pages/balance/balance",
"iconName": "http://amy.yyinhong.cn/uploads/wximg/pc_wdye.png", "iconName": "http://amy.yyinhong.cn/uploads/wximg/pc_wdye.png",
"text": "我的积分", "text": "我的佣金",
"name": "balance" "name": "balance"
}, { }, {
"pagePath": "/pageSub/pages/mybankList/mybankList", "pagePath": "/pageSub/pages/mybankList/mybankList",
......
ddy/utils/request.js
...@@ -11,17 +11,12 @@ const request = (url = '', method = 'GET', data = {}, header = { //这里这样 ...@@ -11,17 +11,12 @@ const request = (url = '', method = 'GET', data = {}, header = { //这里这样
data: data, //传递参数 data: data, //传递参数
header: header, //自定义头部，和后端商同后编写 header: header, //自定义头部，和后端商同后编写
success: (res) => { success: (res) => {
console.log(res)
if (res.data.code == 403) { //自定请求失败的情况，这里以常见的token失效或过期为例 if (res.data.code == 403) { //自定请求失败的情况，这里以常见的token失效或过期为例
uni.removeStorageSync('token'); uni.removeStorageSync('token');
uni.showToast({ uni.reLaunch({
title: "" + res.data.message, url: '/pages/login/login'
icon: 'none', })
complete() {
uni.reLaunch({
url: '/pages/login/login'
})
}
});
return return
} }
if (res.data.code == 500 || res.data.code == 201) { //自定请求失败的情况 if (res.data.code == 500 || res.data.code == 201) { //自定请求失败的情况
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment