| App.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages.json | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/home/home.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/home/supplier-home.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/login/supplier-login.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| sub_pages/supplier/flower-manage/flower-manage.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| sub_pages/supplier/supplier-reg/supplier-reg.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
App.vue
@@ -7,68 +7,64 @@ export default { onLaunch: function(options) { // #ifdef MP // { // if(decodeURIComponent(options.query.q)) // if (options.inviter) { // //说明是邀请的，需要保存下来, // this.$storage.setItem('inviter', options.inviter) // //有效24小时 // this.$storage.setItem('inviterTime', new Date().getTime()) // } // if (options.inviterName) { // this.$storage.setItem('inviterName', options.inviterName) // this.inviterName = options.inviterName // }else{ // this.inviterName = this.$storage.getItem('inviterName') || '' // } // } // #endif console.warn('当前组件仅支持 uni_modules 目录结构 ，请升级 HBuilderX 到 3.1.0 版本以上！') console.log('App Launch') uni.getSystemInfo({ success: (e) => { // this.globalData.StatusBar = e.statusBarHeight; try { let custom = uni.getMenuButtonBoundingClientRect(); // this.globalData.Custom = custom; // this.globalData.CustomBar = custom.bottom + custom.top - e.statusBarHeight; uni.setStorageSync('StatusBar', e.statusBarHeight); uni.setStorageSync('CustomBar', (custom.bottom + custom.top - e.statusBarHeight)); } catch (e) { console.error('e', e) } } }); // #ifdef MP if (true && storage.getItem('token')) { setTimeout(async () => { const res = await this.$store.dispatch('getCurrentInfo'); // console.log('init info',res,this.currentInfo) // #ifdef PUB_CUSTOMER // #ifndef PUB_CUSTOMER if (this.currentInfo && this.currentInfo.id && !this.currentInfo.openId) { uni.reLaunch({ url: '/pages/home/supplier-home' }) } else { uni.reLaunch({ url: '/pages/login/supplier-login' }) } // #endif }, 200); } else { // #ifndef PUB_CUSTOMER uni.reLaunch({ url: '/pages/login/supplier-login' }) // #endif } // #endif // #ifdef H5 if (true && storage.getItem('token')) { setTimeout(async () => { const res = await this.$store.dispatch('getCurrentInfo'); // console.log('init info',res,this.currentInfo) if (this.currentInfo && this.currentInfo.id && !this.currentInfo.openId) { // uni.reLaunch({ // url: '/pages/home/supplier-home' // }) } }, 200); } else { } // #ifdef PUB_CUSTOMER uni.reLaunch({ url: '/pages/home/home' }) // #endif // // #ifdef H5 // if (true && storage.getItem('token')) { // setTimeout(async () => { // const res = await this.$store.dispatch('getCurrentInfo'); // // console.log('init info',res,this.currentInfo) // if (this.currentInfo && this.currentInfo.id && !this.currentInfo.openId) { // // uni.reLaunch({ // // url: '/pages/home/supplier-home' // // }) // } // }, 200); // } else { // } // // #endif }, onReady() { pages.json
@@ -4,18 +4,6 @@ "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" }, "pages": [ // #ifdef PUB_CUSTOMER { "path": "pages/home/home", "style": { "navigationBarTitleText": "首页", "enablePullDownRefresh": true, "navigationStyle": "custom" } }, // #endif { "path": "pages/login/supplier-login", "style": { @@ -32,6 +20,17 @@ } }, // #ifdef PUB_CUSTOMER { "path": "pages/home/home", "style": { "navigationBarTitleText": "首页", "enablePullDownRefresh": true, "navigationStyle": "custom" } }, // #endif { "path": "pages/user/supplier-user", "style": { @@ -199,13 +198,5 @@ "app-plus": { "background": "#efeff4" } }, "condition": { //模式配置，仅开发期间生效 "current": 0, //当前激活的模式(list 的索引项) "list": [{ "name": "", //模式名称 "path": "", //启动页面，必选 "query": "" //启动参数，在页面的onLoad函数里面得到 }] } } pages/home/home.vue
@@ -177,9 +177,10 @@ // this.schools = res.data || [] // } // }) uni.navigateTo({ url: '/sub_pages/customer/trade/detail' }) // uni.navigateTo({ // url: '/sub_pages/customer/trade/detail' // }) //获取banner图 this.$http.request('get', '/api/ua/banner/list', { pages/home/supplier-home.vue
@@ -224,24 +224,24 @@ this.scrollable = false } let that = this if (this.noticeList.length >= 1) { setInterval(() => { console.log('interval,1') that.currentNoticeIndex += 1 that.currentNoticeIndex %= that.noticeList.length that.currentNotice = that.noticeList[that.currentNoticeIndex] that.scrollable = false that.$nextTick(() => { if (that.currentNotice.title && that.currentNotice.title .length >= 30) { that.scrollable = true } else { that.scrollable = false } }) // if (this.noticeList.length >= 1) { // setInterval(() => { // console.log('interval,1') // that.currentNoticeIndex += 1 // that.currentNoticeIndex %= that.noticeList.length // that.currentNotice = that.noticeList[that.currentNoticeIndex] // that.scrollable = false // that.$nextTick(() => { // if (that.currentNotice.title && that.currentNotice.title // .length >= 30) { // that.scrollable = true // } else { // that.scrollable = false // } // }) }, 8000) } // }, 8000) // } } } pages/login/supplier-login.vue
@@ -13,24 +13,36 @@ <view class="title-1">HELLO</view> <view class="title-2">欢迎登录<span class="title-3">花满芜</span></view> </view> <view class="t-a input" v-if="loginType=='pwd'"> <input type="text" name="userName" placeholder="请输入账号" v-model="userName" /> <view class="t-a input form-input" v-if="loginType=='pwd'"> <!-- <input type="text" name="userName" placeholder="请输入账号" v-model="userName" /> --> <u-input placeholder="请输入账号" :border="false" v-model="userName"></u-input> </view> <view class="t-a input" v-if="loginType=='pwd'"> <input type="text" :password="true" name="password" placeholder="请输入密码" v-model="password" /> <view class="t-a input form-input" v-if="loginType=='pwd'"> <!-- <input type="text" :password="true" name="password" placeholder="请输入密码" v-model="password" /> --> <u-input :password="true" :border="false" placeholder="请输入密码" v-model="password"></u-input> </view> <view class="t-a input" v-if="loginType=='code'"> <view class="t-a input form-input" v-if="loginType=='code'"> <input type="text" name="userName" placeholder="请输入手机号" v-model="phoneNumber" /> <!-- <input type="text" name="userName" placeholder="请输入手机号" v-model="phoneNumber" /> <view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()"> {{getCodeText}} </view> --> <u-input placeholder="请输入手机号" :border="false" v-model="phoneNumber"> <template slot="suffix"> <view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()"> {{getCodeText}} </view> </template> </u-input> </view> <view class="t-a input" v-if="loginType=='code'"> <input type="text" name="userName" placeholder="请输入手机验证码" v-model="smsCode" /> <view class="t-a form-input" v-if="loginType=='code'"> <!-- <input type="text" name="userName" placeholder="请输入手机验证码" v-model="smsCode" /> --> <u-input placeholder="请输入手机验证码" :border="false" v-model="smsCode"></u-input> </view> <button @tap="login()" class="bottom-button">登 录</button> @@ -39,7 +51,10 @@ <view class="topic-font" v-if="loginType=='pwd'" @click="loginType='code'">手机验证码登录</view> <view class="topic-font" v-if="loginType=='code'" @click="loginType='pwd'">账号密码登录</view> <!-- #ifdef PUB_SUPPLIER --> <view class="topic-font m-l-a m-r-0" @click="toReg">前往注册</view> <!-- #endif --> </view> </form> </view> @@ -92,6 +107,7 @@ }, methods: { async getCode() { console.log('getCode') uni.hideKeyboard() //隐藏已经显示的软键盘，如果软键盘没有显示则不做任何操作。 if (this.getCodeisWaiting) { return; @@ -242,7 +258,24 @@ } }; </script> <style lang="scss" scoped> .form-input { background-color: #f8f7fc; border-radius: 50rpx; margin-bottom: 50rpx; border: 1px solid #e9e9e9; /deep/ .u-input{ padding-left: 60rpx !important; padding-right: 40rpx !important; } /deep/ input { height: 70rpx; line-height: 70rpx; } } </style> <style lang="scss" scoped> @import './login.scss'; @@ -303,7 +336,7 @@ } .t-login input { padding: 0 20rpx 0 120rpx; padding: 0 20rpx 0 60rpx; height: 90rpx; line-height: 90rpx; margin-bottom: 50rpx; @@ -317,9 +350,9 @@ position: relative; .get-code { position: absolute; right: 40rpx; top: 25rpx; // position: absolute; // right: 40rpx; // top: 25rpx; } } @@ -404,9 +437,9 @@ font-size: 27rpx; } .t-login .uni-input-placeholder { color: #000; } // .t-login .uni-input-placeholder { // color: #000; // } .cl { zoom: 1; sub_pages/supplier/flower-manage/flower-manage.vue
@@ -5,7 +5,7 @@ <view @click.stop="clickButton('in')" class="button button-search-in"></view> <view @click.stop="clickButton('unpass')" class="button button-search-unpass"></view> <view @click.stop="clickButton('inpass')" class="button button-search-inpass" style="flex:5"></view> <view @click.stop="clickButton('delete')" class="button button-search-delete"></view> <view @click.stop="clickButton('delete')" class="button button-search-delete" style="margin-top: -1rpx;"></view> </view>
@@ -15,34 +15,47 @@ </view> <view class="t-a input" v-if="loginType=='code'"> <input type="text" name="userName" placeholder="请输入手机号" v-model="phoneNumber" /> <view class="t-a form-input" v-if="loginType=='code'"> <u-input placeholder="请输入手机号" :border="false" v-model="phoneNumber"> <template slot="suffix"> <view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()"> {{getCodeText}} </view> </template> </u-input> <!-- <u-input type="text" name="userName" placeholder="请输入手机号" v-model="phoneNumber" style="position: relative;z-index: 1;" /> --> </view> <view class="t-a input" v-if="loginType=='code'"> <input type="text" name="userName" placeholder="请输入手机验证码" v-model="smsCode" /> <view class="t-a form-input" v-if="loginType=='code'"> <!-- <input type="text" name="userName" placeholder="请输入手机验证码" v-model="smsCode" style="position: relative;z-index: 1;" /> --> <u-input placeholder="请输入手机验证码" :border="false" v-model="smsCode"></u-input> </view> <view class="t-a input" v-if="loginType=='code'"> <input type="text" :password="true" name="password" placeholder="请输入密码" v-model="password" /> <view class="t-a form-input" v-if="loginType=='code'"> <!-- <input type="text" :password="true" name="password" placeholder="请输入密码" v-model="password" /> --> <u-input :password="true" :border="false" placeholder="请输入密码" v-model="password"></u-input> </view> <button @tap="login()" class="bottom-button">注 册</button> <view class="flex"> <view class="topic-font m-l-a m-r-0" @click="toLogin">前往登录</view> </view> <view class="flex flex-wrap-normal" style="position: fixed;bottom: 40rpx;left: 40rpx;right: 40rpx;" v-if="false"> <view class="flex flex-wrap-normal" style="position: fixed;bottom: 40rpx;left: 40rpx;right: 40rpx;" v-if="false"> <view :style="{'margin-top': '8rpx','margin-right': '12rpx','font-size':'24rpx'}" @click="protocal=!protocal" class="component-radio" :class="[protocal?'cur':'']"> @click="protocal=!protocal" class="component-radio" :class="[protocal?'cur':'']"> </view> <view class="topic-gray" @click="toProtocol">请仔细阅读《花满芜合伙人供应商入口小程序隐私保护指引》如您同意该指引，请勾选开始使用本小程序</view> <view class="topic-gray" @click="toProtocol">请仔细阅读《花满芜合伙人供应商入口小程序隐私保护指引》如您同意该指引，请勾选开始使用本小程序 </view> </view> </form> </view> @@ -84,7 +97,10 @@ // await this.$message.confirm('是否同意入驻协议') // this.protocal = true console.log('getCode') setTimeout(() => { uni.hideKeyboard() //隐藏已经显示的软键盘，如果软键盘没有显示则不做任何操作。 }, 200) if (this.getCodeisWaiting) { return; } @@ -223,7 +239,24 @@ } }; </script> <style lang="scss" scoped> .form-input { background-color: #f8f7fc; border-radius: 50rpx; margin-bottom: 50rpx; border: 1px solid #e9e9e9; /deep/ .u-input{ padding-left: 60rpx !important; padding-right: 40rpx !important; } /deep/ input { height: 70rpx; line-height: 70rpx; } } </style> <style lang="scss" scoped> @import '@/pages/login/login.scss'; @@ -284,7 +317,7 @@ } .t-login input { padding: 0 20rpx 0 120rpx; padding: 0 20rpx 0 60rpx; height: 90rpx; line-height: 90rpx; margin-bottom: 50rpx; @@ -298,10 +331,14 @@ position: relative; .get-code { position: absolute; right: 40rpx; top: 25rpx; z-index: 99; // position: absolute; // right: 0rpx; // top: 0rpx; // z-index: 99; // padding-top: 25rpx; // bottom: 0; // padding-right: 40rpx; // padding-left: 20rpx; } }
