diff --git a/App.vue b/App.vue index 4eb0e3d..7eba616 100644 --- a/App.vue +++ b/App.vue @@ -5,7 +5,6 @@ import { export default { onLaunch: function (e) { var that = this; //获取设备信息 - this.setMenuHeight(); this.autoUpdate(); uni.hideTabBar() @@ -24,13 +23,16 @@ export default { inviterId: null, //分享码 systemInfo: null, + scene: null, //场景码 }, onShow(e) { + + this.globalData.scene = e.scene + console.log(this.globalData.scene,'this.globalData.scene') //隐藏系统tabbar uni.hideTabBar(); var query = {}; - if (e.query.q) { //通过扫码进来获取二维码上的参数并存入storage let urlSpread = e.query.q; @@ -56,6 +58,157 @@ export default { }, methods: { + sceneInfo(s) { + console.log(s) + var scene = []; + switch (s) { + case 1001: + scene.push(s, "发现栏小程序主入口"); + break; + case 1005: + scene.push(s, "顶部搜索框的搜索结果页"); + break; + case 1006: + scene.push(s, "发现栏小程序主入口搜索框的搜索结果页"); + break; + case 1007: + scene.push(s, "单人聊天会话中的小程序消息卡片"); + break; + case 1008: + scene.push(s, "群聊会话中的小程序消息卡片"); + break; + case 1011: + scene.push(s, "扫描二维码"); + break; + case 1012: + scene.push(s, "长按图片识别二维码"); + break; + case 1014: + scene.push(s, "手机相册选取二维码"); + break; + case 1017: + scene.push(s, "前往体验版的入口页"); + break; + case 1019: + scene.push(s, "微信钱包"); + break; + case 1020: + scene.push(s, "公众号profile页相关小程序列表"); + break; + case 1022: + scene.push(s, "聊天顶部置顶小程序入口"); + break; + case 1023: + scene.push(s, "安卓系统桌面图标"); + break; + case 1024: + scene.push(s, "小程序profile页"); + break; + case 1025: + scene.push(s, "扫描一维码"); + break; + case 1026: + scene.push(s, "附近小程序列表"); + break; + case 1027: + scene.push(s, "顶部搜索框搜索结果页“使用过的小程序”列表"); + break; + case 1028: + scene.push(s, "我的卡包"); + break; + case 1029: + scene.push(s, "卡券详情页"); + break; + case 1031: + scene.push(s, "长按图片识别一维码"); + break; + case 1032: + scene.push(s, "手机相册选取一维码"); + break; + case 1034: + scene.push(s, "微信支付完成页"); + break; + case 1035: + scene.push(s, "公众号自定义菜单"); + break; + case 1036: + scene.push(s, "App分享消息卡片"); + break; + case 1037: + scene.push(s, "小程序打开小程序"); + break; + case 1038: + scene.push(s, "从另一个小程序返回"); + break; + case 1039: + scene.push(s, "摇电视"); + break; + case 1042: + scene.push(s, "添加好友搜索框的搜索结果页"); + break; + case 1044: + scene.push(s, "带shareTicket的小程序消息卡片"); + break; + case 1047: + scene.push(s, "扫描小程序码"); + break; + case 1048: + scene.push(s, "长按图片识别小程序码"); + break; + case 1049: + scene.push(s, "手机相册选取小程序码"); + break; + case 1052: + scene.push(s, "卡券的适用门店列表"); + break; + case 1053: + scene.push(s, "搜一搜的结果页"); + break; + case 1054: + scene.push(s, "顶部搜索框小程序快捷入口"); + break; + case 1056: + scene.push(s, "音乐播放器菜单"); + break; + case 1058: + scene.push(s, "公众号文章"); + break; + case 1059: + scene.push(s, "体验版小程序绑定邀请页"); + break; + case 1064: + scene.push(s, "微信连Wifi状态栏"); + break; + case 1067: + scene.push(s, "公众号文章广告"); + break; + case 1068: + scene.push(s, "附近小程序列表广告"); + break; + case 1072: + scene.push(s, "二维码收款页面"); + break; + case 1073: + scene.push(s, "客服消息列表下发的小程序消息卡片"); + break; + case 1074: + scene.push(s, "公众号会话下发的小程序消息卡片"); + break; + case 1089: + scene.push(s, "微信聊天主界面下拉"); + break; + case 1090: + scene.push(s, "长按小程序右上角菜单唤出最近使用历史"); + break; + case 1092: + scene.push(s, "城市服务入口"); + break; + default: + scene.push("未知入口"); + break; + } + return scene; + }, autoUpdate: function () { // console.log(new Date()); var self = this; // 获取小程序更新机制兼容 diff --git a/config/index.js b/config/index.js index 8e1318a..dbb5bee 100644 --- a/config/index.js +++ b/config/index.js @@ -1,8 +1,8 @@ // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api' -export const VUE_APP_API_URL = 'http://192.168.0.112:8092/api' +// export const VUE_APP_API_URL = 'http://192.168.0.112:8092/api' // export const VUE_APP_API_URL = 'http://192.168.0.111:8092/api' -// export const VUE_APP_API_URL = 'https://cloud.api.cyjyyjy.com/api' +export const VUE_APP_API_URL = 'https://cloud.api.cyjyyjy.com/api' // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://thapi.xinxintuan.co/api' // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api'; diff --git a/main.js b/main.js index b2ba17b..da7db6c 100644 --- a/main.js +++ b/main.js @@ -115,5 +115,6 @@ Vue.mixin({ store.commit('updateDevicetype', deviceType) Vue.prototype.$VUE_APP_API_URL = VUE_APP_API_URL + Vue.component('cu-custom', cuCustom) app.$mount(); diff --git a/pages/Loading/index.vue b/pages/Loading/index.vue index 10b9410..10a78d8 100644 --- a/pages/Loading/index.vue +++ b/pages/Loading/index.vue @@ -49,7 +49,10 @@ export default { if (this.$store.getters.token) { // 如果token存在，直接进行进页面 console.log('登录状态存在，直接进页面') - this.toLaunch() + // this.toLaunch() + this.$yrouter.switchTab({ + path: '/pages/home/index', + }) return } console.log('进行登录操作') diff --git a/pages/demandHall/needsDetail/index.vue b/pages/demandHall/needsDetail/index.vue index 21b8b80..b049cce 100644 --- a/pages/demandHall/needsDetail/index.vue +++ b/pages/demandHall/needsDetail/index.vue @@ -28,7 +28,7 @@ 发布公司 - + {{detail.enterprise.enterpriseName}} diff --git a/pages/life/addGoods/index.vue b/pages/life/addGoods/index.vue index e6ac494..66cc27d 100644 --- a/pages/life/addGoods/index.vue +++ b/pages/life/addGoods/index.vue @@ -96,16 +96,11 @@ 库存* - - + {{batchData.titleStr}} 库存 @@ -136,7 +131,7 @@ 上架 @@ -200,9 +195,9 @@ maskShow: false, addOptionsDialog: false, infinite: false, - batchData: {}, + batchData: {titleStr: '',priceArr: []}, editattr: false, - priceArr: [], + } }, onLoad() { @@ -332,10 +327,15 @@ getFormatAttr(data).then((res)=>{ if(res.success){ this.$set(this.batchData,'priceArr',res.data.value) - let strArr = res.data.attr.map(item=>{ - return item.value - }) - this.$set(this.batchData,'titleStr',strArr.join('/')) + if(res.data.attr){ + let strArr = res.data.attr.map(item=>{ + return item.value + }) + this.$set(this.batchData,'titleStr',strArr.join('/')) + } else{ + this.$set(this.batchData,'titleStr','') + } + } else{ uni.showToast({ title: res.msg, @@ -344,32 +344,6 @@ } }) }, - //属性设置数据 - setBatchData(arr){ - var titleArr = [] - for (var i in arr) { - titleArr.push(arr[i].value) - } - var titleStr = titleArr.join('/') - var attrArr = this.setData(arr) - var branchList = [] - var hash = {} - attrArr.forEach((item,idx)=>{ - branchList.push({ - sku: item.join('/'), - pic: '', //"规格图片 --可选", - price: '', //"价格 元", - ot_orice: '', //"市场价格 --可选", - stock: '', //"库存", - weight: '', //"重量 --可选", - volume: '', //"体积 --可选" - }) - }) - console.log(attrArr,'attrArr') - this.priceArr = branchList - this.batchData.attrArr = attrArr - console.log(this.batchData) - }, //数组整合 setData(attrArr){ var tmp = [] @@ -393,45 +367,23 @@ // 批量设置价格库存 changePrice(e){ const price = e.detail.value - this.batchData.priceArr.forEach((item,i)=>{ - item.price = price - }) + if(this.batchData.priceArr && this.batchData.priceArr.length > 0){ + this.batchData.priceArr.forEach((item,i)=>{ + item.price = price + }) + } this.attrs[0].price = price // console.log(this.batchData.priceArr,'this.batchData.priceArr') }, changeStock(e){ const stock = e.detail.value - this.batchData.priceArr.forEach((item,i)=>{ - item.stock = stock - }) + if(this.batchData.priceArr && this.batchData.priceArr.length > 0){ + this.batchData.priceArr.forEach((item,i)=>{ + item.stock = stock + }) + } this.attrs[0].stock = stock }, - //单规格 - addSku(){ - let item = { - pic: '', //"规格图片 --可选", - price: '', //"价格 元", - ot_orice: '', //"市场价格 --可选", - stock: '', //"库存", - weight: '', //"重量 --可选", - volume: '', //"体积 --可选" - } - this.attrs.push(item) - uni.pageScrollTo({ - scrollTop: 999999 - }) - }, - delSku(idx){ - this.attrs.splice(idx,1) - }, - //库存有限无限切换 - stockChange(e){ - // console.log(e) - this.infinite = !e.detail.value - }, - radioChange(e){ - this.state = e.detail.value - }, submit(){ // console.log(this.batchData) var arrtsArr = [] @@ -446,7 +398,7 @@ image: this.slider_image[0], //主图 slider_image: this.slider_image , // 轮播图 description: this.description, //商品详情富文本 - tempId: 1, //运费方案 + tempId: this.tempId, //运费方案 attrs: arrtsArr, state: this.state, items: this.items, @@ -484,9 +436,9 @@ duration: 1500 }) setTimeout((res)=>{ - uni.navigateTo({ - url: '/pages/user/goodsManage/index' - }) + uni.redirectTo({ + url: '/pages/user/goodsManage/index' + }); },1500) } else{ uni.showToast({ @@ -503,9 +455,9 @@ duration: 1500 }) setTimeout((res)=>{ - uni.navigateTo({ - url: '/pages/user/goodsManage/index' - }) + uni.redirectTo({ + url: '/pages/user/goodsManage/index' + }); },1500) } else{ uni.showToast({ @@ -515,8 +467,6 @@ } }) } - - console.log(form,'form') }, alertMessage(msg){ uni.showToast({ diff --git a/pages/release/companyAuth/index.vue b/pages/release/companyAuth/index.vue index 14cfe96..b809c56 100644 --- a/pages/release/companyAuth/index.vue +++ b/pages/release/companyAuth/index.vue @@ -1,118 +1,129 @@ \ No newline at end of file + /* pages/release/companyAuth/index.wxss */ + + .is-legal-box { + width: 100%; + padding: 30rpx 40rpx; + } + + .is-legal-box label { + margin-right: 40rpx; + } + + .authbook-box { + font-size: 28rpx; + color: #666; + } + + .tips { + margin: 40rpx 0; + } + + .upload-box image { + width: 332rpx; + height: 204rpx; + } + + .splitLine { + width: 100%; + height: 20rpx; + background-color: #eee; + } + + .company-info-box { + width: 100%; + padding: 32rpx 40rpx; + } + + .title { + font-size: 32rpx; + color: #1D1D1D; + margin-bottom: 38rpx; + font-weight: 500; + } + + .form-item { + font-size: 28rpx; + color: #666666; + padding: 16rpx 0; + border-bottom: 2rpx solid #EEEEEE; + } + + .form-item .inp-box { + width: 70%; + text-align: right; + } + + .yyzz image { + width: 670rpx; + height: 368rpx; + margin-top: 26rpx; + } + + .noBorder { + border: none; + } + + .form-item .sfz { + width: 100%; + margin-top: 26rpx; + } + + .sfz image { + width: 332rpx; + height: 205rpx; + margin-bottom: 10rpx; + } + + .submit-btn { + width: 670rpx; + height: 76rpx; + background: linear-gradient(144deg, #FFA782 0%, #FF5100 100%); + border-radius: 38rpx; + color: #fff; + font-size: 28rpx; + line-height: 76rpx; + text-align: center; + margin: 40rpx auto; + } + + .arrorR { + width: 14rpx; + height: 24rpx; + margin-left: 10rpx; + } + diff --git a/pages/release/index.vue b/pages/release/index.vue index a9cbb97..ceb5f6e 100644 --- a/pages/release/index.vue +++ b/pages/release/index.vue @@ -11,7 +11,7 @@ 注：完成企业认证后可以发布资源及需求，个人认证后只可发布需求 - + ! 请先完成认证 @@ -26,6 +26,7 @@ ! {{authType == 1 ? '企业信息未审核通过， 请重新提交审核信息！' : '个人信息未审核通过， 请重新提交审核信息！'}} + 未通过理由：{{reason}} @@ -159,7 +160,8 @@ export default { authStatus: res.data.data.authenticationState, authType: res.data.data.authorizationType, completeState: res.data.data.completeState, - authInfo: res.data.data.authInfo + authInfo: res.data.data.authInfo, + reason: res.data.data.authInfo.reason }); } }); diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue index 5e0a7d1..25fc41a 100644 --- a/pages/shop/GoodsCon/index.vue +++ b/pages/shop/GoodsCon/index.vue @@ -420,7 +420,7 @@ export default { }) getProductDetail(that.id, from) .then(res => { - res.data.storeInfo.description = res.data.storeInfo.description.replace(/\ - - + + + + @@ -387,7 +389,7 @@ export default { color:#666666; } .form-item{ - margin-bottom: 60rpx; + margin-bottom: 20rpx; } .red{ @@ -402,7 +404,7 @@ export default { padding: 10rpx 22rpx; background: #eee; color: #666; - margin-top: 36rpx; + margin-top: 26rpx; } .pick-box{ width: 92%; @@ -481,7 +483,7 @@ export default { margin: 0 14rpx; } .submit-btn{ - width: 670rpx !important; + width: 240rpx !important; height: 76rpx !important; background: linear-gradient(144deg, #FFA782 0%, #FF5100 100%); border-radius: 38rpx; @@ -492,4 +494,7 @@ export default { margin:40rpx auto 20rpx !important; padding: 0 !important; } +.default-btn{ + background: #BFBFBF; +} \ No newline at end of file diff --git a/pages/user/goodsManage/index.vue b/pages/user/goodsManage/index.vue index bc92e01..8310eef 100644 --- a/pages/user/goodsManage/index.vue +++ b/pages/user/goodsManage/index.vue @@ -11,11 +11,11 @@ - - 等待审核 - 审核通过 - 审核不通过 - 商品有问题 + + 等待审核 + 审核通过 + 审核不通过： + {{item.refuseMessage}} @@ -61,6 +61,8 @@ }, onShow() { this.getProducts() + let pages = getCurrentPages(); + console.log(pages) }, onReachBottom() { this.getProducts() @@ -189,7 +191,7 @@ padding: 90rpx 40rpx 126rpx; .goods-item{ width: 100%; - padding: 32rpx 22rpx 16rpx; + padding: 16rpx 22rpx 16rpx; border-radius: 12rpx; background: #fff; font-size: 28rpx; @@ -253,6 +255,7 @@ } .review-box{ font-size: 24rpx; + margin: 0rpx 0 16rpx; .status{ color: #ff4949; } @@ -263,9 +266,8 @@ color: #409eff; } .message{ - font-size: 22rpx; color:#ff4949; - width: 60%; + // width: 60%; } } .add-btn{ diff --git a/pages/user/index.vue b/pages/user/index.vue index e8f01df..b22fc87 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -51,15 +51,14 @@ + + + 需求管理 - @@ -238,10 +237,10 @@ export default { authStatus: 0, authType: 0, completeState: "", - currentTabIndex: 4 + currentTabIndex: 4, + scene: app.globalData.scene }; }, - components: { tabbar }, @@ -300,7 +299,6 @@ export default { }, toAuthInfo() { let type = this.authType; - if (type == 1) { uni.navigateTo({ url: '/pages/release/perfectCompanyInfo/index?isEdit=' + 1 @@ -313,6 +311,7 @@ export default { }, toAuth() { + uni.navigateTo({ url: '/pages/release/index' }); @@ -424,7 +423,13 @@ export default { this.$yrouter.push('/pages/user/openStore/index') }, toMyShop(){ - this.$yrouter.push('/pages/user/myShop/index') + if(this.userInfo.store.status == 0 || this.userInfo.store.status == -1){ + this.$yrouter.push('/pages/user/openStore/index') + } else{ + this.$yrouter.push('/pages/user/myShop/index') + } + + }, } }; diff --git a/pages/user/mine/index.vue b/pages/user/mine/index.vue index 5cb46ad..a9320e5 100644 --- a/pages/user/mine/index.vue +++ b/pages/user/mine/index.vue @@ -1,583 +1,620 @@ \ No newline at end of file + /* pages/user/index.wxss */ + page { + background: #212226; + } + + image { + width: 100%; + height: 100%; + } + + .user-index-box { + min-height: 100vh; + color: #EFDACA; + position: relative; + } + + .user-index-top { + width: 100%; + height: 1070rpx; + position: relative; + } + + .user-index-top .top-bg { + position: absolute; + top: 0; + left: 0; + } + + .user-info-box { + position: absolute; + top: 160rpx; + left: 40rpx; + z-index: 2; + } + + .header-img { + width: 134rpx; + height: 134rpx; + margin-right: 34rpx; + } + + .header-img image { + width: 134rpx; + height: 134rpx; + border-radius: 50%; + } + + .user-info { + width: 450rpx; + } + + .user-title { + /* width: 242rpx; */ + /* height: 56rpx; */ + } + + .user-title image { + width: 242rpx; + height: 56rpx; + } + + .user-title .backhome { + width: 146rpx; + height: 56rpx; + margin-left: 14rpx; + } + + .menu-box { + width: 670rpx; + height: 244rpx; + border: 2px solid #EFDACA; + border-radius: 16rpx; + position: absolute; + top: 330rpx; + left: 40rpx; + padding: 20rpx 0 16rpx 16rpx; + } + + .menu-title-box { + font-size: 32rpx; + line-height: 44rpx; + font-weight: bold; + } + + .fz20 { + font-size: 20rpx; + font-weight: normal; + } + + .see-more image { + width: 10rpx; + height: 18rpx; + display: block; + margin-left: 10rpx; + } + + .scroll-view_H { + white-space: nowrap; + width: 100%; + } + + .menu-list { + margin-top: 36rpx; + } + + .menu-item { + display: inline-block; + text-align: center; + margin-right: 30rpx; + } + + .menu-item image { + width: 70rpx; + height: 70rpx; + display: inline-block; + margin-bottom: 6rpx; + } + + .myIncome-box { + position: absolute; + top: 620rpx; + left: 40rpx; + } + + .income-box { + width: 670rpx; + height: 208rpx; + border-radius: 12rpx; + margin-top: 10rpx; + position: relative; + } + + .income-box image { + width: 670rpx; + height: 208rpx; + position: absolute; + top: 0; + left: 0; + } + + .income-l { + width: 50%; + height: 100%; + position: absolute; + left: 0; + z-index: 2; + color: #946F46; + padding: 30rpx 0 20rpx; + } + + .num { + color: #363636; + font-size: 36rpx; + font-weight: bold; + } + + .btn { + width: 124rpx; + height: 44rpx; + line-height: 44rpx; + text-align: center; + background: #EFDACA; + border-radius: 62rpx; + font-size: 26rpx; + } + + .income-r { + left: 50%; + } + + .invitation-list-box { + position: relative; + z-index: 99; + top: -140rpx; + } + + .invi-title { + padding-left: 40rpx; + font-size: 32rpx; + color: #EFDACA; + line-height: 40rpx; + margin-bottom: 12rpx; + } + + .list-box { + width: 100%; + background: #212226; + border-radius: 40rpx 40rpx 0px 0px; + padding-top: 36rpx; + } + + .medal-box {} + + .medal { + width: 224rpx; + height: 336rpx; + font-size: 20rpx; + color: #946F46; + display: flex; + flex-direction: column; + align-items: center; + position: relative; + text-align: center; + line-height: 38rpx; + } + + .medal .medal-bg { + width: 224rpx; + height: 336rpx; + position: absolute; + } + + .medal-content { + width: 100%; + height: 100%; + position: absolute; + top: 0; + z-index: 22; + } + + .user-header { + width: 86rpx; + height: 86rpx; + border-radius: 50%; + overflow: hidden; + position: absolute; + left: 50%; + top: -43rpx; + transform: translateX(-50%); + } + + .medal-content .user-name { + color: #363636; + font-size: 24rpx; + line-height: 34rpx; + margin-bottom: 16rpx; + margin-top: 56rpx; + } + + .income-money { + font-size: 28rpx; + color: #363636; + font-weight: bold; + /* margin-top: 16rpx; */ + } + + .medal-icon { + width: 136rpx; + height: 136rpx; + position: absolute; + right: -68rpx; + bottom: -10rpx; + } + + .medal1 { + margin: 0 22rpx; + z-index: 99; + } + + .medal2, + .medal3 { + width: 202rpx; + height: 303rpx; + margin-top: 80rpx; + } + + .medal3 { + margin-top: 100rpx; + } + + .medal2 .medal-icon { + width: 112rpx; + height: 112rpx; + bottom: -20rpx; + right: -20rpx; + } + + .medal2 .medal-bg, + .medal3 .medal-bg { + width: 202rpx; + height: 303rpx; + } + + .medal3 .medal-icon { + width: 100rpx; + height: 100rpx; + right: -20rpx; + } + + .rank-list-box { + width: 100%; + max-height: 780rpx; + padding: 0 40rpx; + font-size: 24rpx; + overflow-y: scroll; + } + + .rank-item .num { + min-width: 50rpx; + color: #E4C6B0; + } + + .item-right-l image { + width: 74rpx; + height: 74rpx; + border-radius: 50%; + margin-right: 16rpx; + } + + .item-right-l { + width: 70%; + } + + .item-right-l .name { + font-size: 24rpx; + color: #fff; + width: 80%; + } + + .item-right { + width: 618rpx; + height: 132rpx; + border-bottom: 1px solid #6B6158; + } + + .item-right-r { + text-align: right; + } + + .share-btn { + width: 334rpx !important; + height: 132rpx !important; + padding: 0 !important; + margin: 40rpx auto !important; + background: transparent !important; + position: fixed; + bottom: 0rpx; + left: 50%; + margin-left: -162rpx !important; + z-index: 999; + } + + .share-btn image { + width: 334rpx; + height: 132rpx; + display: inline-block; + } + diff --git a/pages/user/openStore/index.vue b/pages/user/openStore/index.vue index 521e4e7..ef8fbde 100644 --- a/pages/user/openStore/index.vue +++ b/pages/user/openStore/index.vue @@ -1,5 +1,10 @@