徐强 / market_manage · 提交

转到一个项目

作者 xuqiang
提交 01a307b46b3c258e85e67eeb05a6a411b654cfaf 1 个父辈 b2403341

提交

内嵌 并排对比
正在显示 15 个修改的文件 包含 322 行增加 和 105 行删除
... ... @@ -4,6 +4,28 @@
},
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{
"path": "pages/index/indexNoLogin",
"style": {
"navigationBarTitleText": "市场监管",
"navigationBarBackgroundColor":"#2e7ff9",
"navigationBarTextStyle":"white"
}
},
{
"path": "pages/index/employ/editPasswordOrigin",
"style": {
"navigationBarTitleText": "市场监管"
}
},
{
"path": "pages/index/employ/personCenter",
"style": {
"navigationBarTitleText": "个人中心",
"navigationBarBackgroundColor":"#2e7ff9",
"navigationBarTextStyle":"white"
}
},
{
"path": "pages/index/employ/my",
"style": {
"navigationBarTitleText": "我的",
... ... @@ -257,14 +279,6 @@
}
},
{
"path": "pages/index/indexNoLogin",
"style": {
"navigationBarTitleText": "市场监管",
"navigationBarBackgroundColor":"#2e7ff9",
"navigationBarTextStyle":"white"
}
},
{
"path": "pages/index/setNewPassword",
"style": {
"navigationBarTitleText": "市场监管",
... ... @@ -316,27 +330,14 @@
"navigationBarTitleText": "uni-app",
"navigationBarBackgroundColor": "#fff",
"backgroundColor": "#F8F8F8"
}
/* "tabBar": {
"color": "#7A7E83",
"selectedColor": "#2e7ff9",
"borderStyle": "black",
"backgroundColor": "#ffffff",
},
"tabBar": {
"list": [{
"pagePath": "pages/index/index",
"iconPath": "static/image/ic_8@2x.png",
"selectedIconPath": "static/image/ic_8_select@2x.png",
"text": "首页"
"pagePath": "pages/index/index"
}, {
"pagePath": "pages/demand/publish",
"iconPath": "static/image/ic_9@2x.png",
"selectedIconPath": "static/image/ic_9_select@2x.png",
"text": "需求"
"pagePath": "pages/demand/publish"
}, {
"pagePath": "pages/my/my",
"iconPath": "static/image/ic_10@2x.png",
"selectedIconPath": "static/image/ic_10_select@2x.png",
"text": "我的"
"pagePath": "pages/my/my"
}]
} */
}
}
... ...
... ... @@ -55,6 +55,7 @@
</template>
<script>
import {tabBarList} from "../../static/js/userTabBar.js"
export default {
data() {
return {
... ... @@ -63,25 +64,6 @@
show: true,
bgColor: '#ffffff',
borderTop: true,
tabBarList: [{
iconPath: "/static/image/ic_8@2x.png",
selectedIconPath: "/static/image/ic_8_select@2x.png",
text: '首页',
customIcon: false,
},
{
iconPath: "/static/image/ic_9@2x.png",
selectedIconPath: "/static/image/ic_9_select@2x.png",
text: '需求',
customIcon: false,
},
{
iconPath: "/static/image/ic_10@2x.png",
selectedIconPath: "/static/image/ic_10_select@2x.png",
text: '我的',
customIcon: false,
},
],
midButton: false,
inactiveColor: '#909399',
activeColor: '#5098FF',
... ... @@ -92,7 +74,8 @@
imgList: [],
modalName: null,
textareaAValue: '',
textareaBValue: ''
textareaBValue: '',
tabBarList:tabBarList
};
},
methods: {
... ...
... ... @@ -104,7 +104,7 @@
</view>
</form>
<view class="cu-bar margin-top" style="display: flex;justify-content: center;">
<view style="background: #2e7ff9;border-radius: 80rpx;height: 80rpx;width: 686rpx;color: #fff;text-align: center;line-height: 80rpx;">
<view @click="submit" style="background: #2e7ff9;border-radius: 80rpx;height: 80rpx;width: 686rpx;color: #fff;text-align: center;line-height: 80rpx;">
立即提交
</view>
</view>
... ... @@ -125,6 +125,17 @@
};
},
methods: {
// 立即提交
submit(){
setTimeout(()=>{
uni.showToast({
title:'提交成功'
})
},200)
uni.navigateBack({
delta:1
})
},
PickerChange(e) {
this.index = e.detail.value
},
... ...
<template>
<view style="padding-top: 1rpx;">
<view class="formWrap">
<view class="formItem">
<view class="itemLeft">
原密码
</view>
<input type="text" value="" placeholder="请输入原密码"/>
</view>
<view class="formItem">
<view class="itemLeft">
新密码
</view>
<input type="text" value="" placeholder="请输入新密码"/>
</view>
<view class="formItem">
<view class="itemLeft">
确认密码
</view>
<input type="text" value="" placeholder="请确认密码"/>
</view>
</view>
<view class="phoneCheck" @click="$href('/pages/my/editPasswordPhone')">
短信验证
</view>
<view class="loginBtnWrap">
<view class="loginBtn">
修改
</view>
</view>
</view>
</template>
<script>
export default{
data(){
return{
}
}
}
</script>
<style lang="scss">
page{
background-color: $uni-bg-color-hui;
}
.formWrap{
margin-top: 20rpx;
background: $uni-bg-bai-color;
.formItem{
padding: 0 32rpx;
height: 110rpx;
display: flex;
align-items: center;
border-bottom: 1rpx solid #ebedf0;
.itemLeft{
width: 150rpx;
font-size: $uni-font-size-30;
image{width: 24rpx;height: 24rpx;margin-left: 10rpx;}
}
input{flex: 1;}
}
}
.phoneCheck{
padding: 20rpx 32rpx;
color: $uni-bg-main-color;
font-size: $uni-font-size-24;
text-align: right;
}
.loginBtnWrap{
padding-top: 100rpx;
display: flex;
justify-content: center;
.loginBtn{
width: 686rpx;
height: 88rpx;
background: $uni-bg-main-color;
border-radius: 96rpx;
text-align: center;
color: $uni-bg-bai-color;
line-height: 88rpx;
font-size: $uni-font-size-32;
}
}
</style>
... ...
<template>
<view>
<!-- 操作区域 -->
<view class="handleWrap">
<view class="handleItem">
<view class="itemLeft">
账号
</view>
<view class="itemRight">
kk21212121
</view>
</view>
<view class="handleItem">
<view class="itemLeft">
修改密码
</view>
<image src="../../../static/image/ic_7@2x.png" mode=""></image>
</view>
<view class="handleItem">
<view class="itemLeft">
姓名
</view>
<view class="itemRight">
王某人
</view>
</view>
<view class="handleItem">
<view class="itemLeft">
部门
</view>
<view class="itemRight">
后勤部
</view>
</view>
<view class="handleItem">
<view class="itemLeft">
职位
</view>
<view class="itemRight">
后勤部主管
</view>
</view>
</view>
</view>
</template>
<script>
export default{
data(){
return{
switchB: true
}
},
methods:{
SwitchB(e) {
this.switchB = e.detail.value
},
}
}
</script>
<style lang="scss" scoped>
/* 操作区域 */
.handleWrap{
padding: 0 32rpx;
.handleItem{
height: 104rpx;
display: flex;
align-items: center;
justify-content: space-between;
border-bottom: 2rpx solid #ebedf0;
.itemLeft{
display: flex;
align-items: center;
font-size: $uni-font-size-28;
width: 202rpx;
font-weight: 600;
image{width: $uni-img-size-32;height: $uni-img-size-32;margin-right: 24rpx;}
}
.itemRight{
flex: 1;
display: flex;
align-items: center;
font-size: $uni-font-size-28;
image{width: $uni-img-size-32;height: $uni-img-size-32;margin-right: 10rpx;}
}
.infoNum{
width: 32rpx;
height: 32rpx;
background: #ff2f2f;
border-radius: 50%;
text-align: center;
line-height: 32rpx;
font-size: $uni-font-size-26;
color: $uni-text-color-bai;
}
image{width: $uni-img-size-32;height: $uni-img-size-32;}
}
}
</style>
... ...
... ... @@ -23,9 +23,9 @@
</view>
</view>
<view class="loginBtnWrap">
<view class="loginBtn">
<navigator :url="'setNewPassword?loginType='+loginType" hover-class="none" class="loginBtn">
下一步
</view>
</navigator>
</view>
<view class="phoneWrap">
客服电话 40036-456-4454
... ... @@ -37,8 +37,13 @@
export default{
data(){
return{
sendCode:true
sendCode:true,
loginType:''
}
},
onLoad(option) {
// 登录类型(company:企业;user:员工)
this.loginType = option.loginType
}
}
</script>
... ...
... ... @@ -26,7 +26,7 @@
<image src="../../static/image/index/ic_6@2x.png" style="width:48rpx;height:48rpx;" mode=""></image>
主要产品
</view>
<view class="titleRight">
<view class="titleRight" @click="$href('productList')">
查看更多
<image src="../../static/image/ic_7@2x.png" mode=""></image>
</view>
... ... @@ -85,6 +85,7 @@
</template>
<script>
import {tabBarList} from "../../static/js/userTabBar.js"
import imgTxtTitle from '@/components/imgTxtTitle.vue'
export default {
data() {
... ... @@ -94,30 +95,11 @@
show: true,
bgColor: '#ffffff',
borderTop: true,
tabBarList: [{
iconPath: "/static/image/ic_8@2x.png",
selectedIconPath: "/static/image/ic_8_select@2x.png",
text: '首页',
customIcon: false,
},
{
iconPath: "/static/image/ic_9@2x.png",
selectedIconPath: "/static/image/ic_9_select@2x.png",
text: '需求',
customIcon: false,
},
{
iconPath: "/static/image/ic_10@2x.png",
selectedIconPath: "/static/image/ic_10_select@2x.png",
text: '我的',
customIcon: false,
},
],
midButton: false,
inactiveColor: '#909399',
activeColor: '#5098FF',
tabBarList:tabBarList,
//底部导航栏区域 结束
list: [{
image: 'https://cdn.uviewui.com/uview/swiper/1.jpg',
title: '昨夜星辰昨夜风，画楼西畔桂堂东'
... ...
... ... @@ -55,14 +55,14 @@
企业入驻
</view>
<view class="loginBtnList">
<view class="loginBtnItem company">
<navigator url="loginCompany" hover-class="none" class="loginBtnItem company">
<image src="../../static/image/index/ic_91@2x.png" mode=""></image>
企业登录
</view>
<view class="loginBtnItem complat">
</navigator>
<navigator url="loginUser" hover-class="none" class="loginBtnItem complat">
<image src="../../static/image/index/ic_92@2x.png" mode=""></image>
平台员工登录
</view>
</navigator>
</view>
</view>
</view>
... ...
... ... @@ -21,12 +21,12 @@
</view>
</view>
<view class="loginBtnWrap">
<view class="loginBtn">
<view class="loginBtn" @click="login">
登录
</view>
</view>
<view class="loginOther">
<text v-if="loginType == 'password'">忘记密码？</text>
<navigator url="forgetPassword?loginType=company" hover-class="none" v-if="loginType == 'password'">忘记密码？</navigator>
<text v-if="loginType == 'password'" @click="loginType = 'code'">短信登录</text>
<text v-if="loginType == 'code'" @click="loginType = 'password'">密码登录</text>
</view>
... ... @@ -39,6 +39,12 @@
return{
loginType:'password'
}
},
methods:{
// 登录
login(){
this.$href('indexEmploy')
}
}
}
</script>
... ...
... ... @@ -21,12 +21,12 @@
</view>
</view>
<view class="loginBtnWrap">
<view class="loginBtn">
<view class="loginBtn" @click="login">
登录
</view>
</view>
<view class="loginOther">
<text v-if="loginType == 'password'">忘记密码？</text>
<navigator url="forgetPassword?loginType=user" hover-class="none" v-if="loginType == 'password'">忘记密码？</navigator>
<text v-if="loginType == 'password'" @click="loginType = 'code'">短信登录</text>
<text v-if="loginType == 'code'" @click="loginType = 'password'">密码登录</text>
</view>
... ... @@ -39,6 +39,12 @@
return{
loginType:'password'
}
},
methods:{
// 登录
login(){
this.$href('index',2)
}
}
}
</script>
... ...
<template>
<view class="productList">
<view class="productItem">
<view class="productItem" @click="$href('productDetail')">
<view class="productLeft">
<view class="productName">
自主研发核心技术
... ...
... ... @@ -68,7 +68,7 @@
1. 资金要求：公司注册资金30万及30万以上人民币，且注册时间壹年以上。 2. 缴纳费用：平台使用费暂定1200元/年，首年免;保证金暂定20000元，首年2000元。 3. 授权资质：需要确保授权链条的完整，即申请入驻企业拿到的授权能够逐级逆推回品牌商。 4. 提供发票：所有入驻的企业必须给消费者提供正规发票，发票盖章的公司名称必须与商家与定吧合作的公司名称一致。 5. 申请类型：定吧商城暂不接受未取得国家商标总局颁发的商标注册证或商标受理通知书的境外品牌的开店申请。
</view>
<view class="replyBtnWrap">
<view class="replyBtn" @click="showFailReason = true">
<view class="replyBtn" @click="apply">
<!-- 条件判断显示：审核中、重新注册 -->
入驻申请
</view>
... ... @@ -104,6 +104,12 @@
return{
showFailReason:false
}
},
methods:{
// 入驻申请
apply(){
this.$href('companyReplay')
}
}
}
</script>
... ...
... ... @@ -15,7 +15,7 @@
</view>
</view>
<view class="loginBtnWrap">
<view class="loginBtn">
<view class="loginBtn" @click="update">
修改
</view>
</view>
... ... @@ -37,6 +37,31 @@
data(){
return{
showSimpleAlert:true,
loginType:''
}
},
onLoad(option) {
// 登录类型(company:企业;user:员工)
this.loginType = option.loginType
},
methods:{
// 修改
update(){
setTimeout(()=>{
uni.showToast({
title:'修改成功！请重新登录！',
icon:'none'
})
},200)
if(this.loginType == 'company'){
uni.reLaunch({
url:'loginCompany'
})
}else{
uni.reLaunch({
url:'loginUser'
})
}
}
}
}
... ...
... ... @@ -82,6 +82,7 @@
</template>
<script>
import {tabBarList} from "../../static/js/userTabBar.js"
export default{
data(){
return{
... ... @@ -90,28 +91,7 @@
show: true,
bgColor: '#ffffff',
borderTop: true,
tabBarList: [{
pagePath: "pages/index/index",
iconPath: "/static/image/ic_8@2x.png",
selectedIconPath: "/static/image/ic_8_select@2x.png",
text: '首页',
customIcon: false,
},
{
pagePath: "pages/demand/publish",
iconPath: "/static/image/ic_9@2x.png",
selectedIconPath: "/static/image/ic_9_select@2x.png",
text: '需求',
customIcon: false,
},
{
pagePath: "pages/my/my",
iconPath: "/static/image/ic_10@2x.png",
selectedIconPath: "/static/image/ic_10_select@2x.png",
text: '我的',
customIcon: false,
},
],
tabBarList: tabBarList,
midButton: false,
inactiveColor: '#909399',
activeColor: '#5098FF',
... ...
// common.js
export const tabBarList = [{
pagePath: "/pages/index/index",
iconPath: "/static/image/ic_8@2x.png",
selectedIconPath: "/static/image/ic_8_select@2x.png",
text: '首页',
customIcon: false,
},
{
pagePath: "/pages/demand/publish",
iconPath: "/static/image/ic_9@2x.png",
selectedIconPath: "/static/image/ic_9_select@2x.png",
text: '需求',
customIcon: false,
},
{
pagePath: "/pages/my/my",
iconPath: "/static/image/ic_10@2x.png",
selectedIconPath: "/static/image/ic_10_select@2x.png",
text: '我的',
customIcon: false,
}
]
... ...