Skip to content

M
mallapp
Commit 6a7318ef authored by youjie's avatar youjie
Browse files
Options

no message

parents 6cd60fcc aa5ad5cd
Show whitespace changes
Inline Side-by-side
Showing with 1134 additions and 967 deletions
components/pay/submit2Pay.vue
View file @ 6a7318ef
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<view class="Alipay-text3">发送“支付”获取支付宝付款链接</view> <view class="Alipay-text3">发送“支付”获取支付宝付款链接</view>
</view> </view>
<view class="Alipay-box33"> <view class="Alipay-box33">
<image class="Alipay-image" src="../../static/images/zhifu.png"></image> <!-- <image class="Alipay-image" src="../../static/images/zhifu.png"></image> -->
</view> </view>
<view class="Alipay-text4" @click="send()" style="margin-bottom: 86rpx;"> <view class="Alipay-text4" @click="send()" style="margin-bottom: 86rpx;">
去发送 去发送
......
components/rubik/index.vue
View file @ 6a7318ef
<template> <template>
<view <view
class="ad-box" class="ad-box"
:class="{'ad-full-height':ad.list[0].link[0].PageName == 'full'}" :class="{'ad-box-full':ad.list[0].link[0].PageName == 'full'}"
:style="{ height: ad.height == 'auto' ? 'auto' : ad.height + 'rpx',padding:marginStyle,backgroundColor:ad.background }" :style="{ height: ad.height == 'auto' ? 'auto' : ad.height + 'rpx',padding:marginStyle,backgroundColor:ad.background }"
> >
<view <view
...@@ -112,7 +112,14 @@ export default { ...@@ -112,7 +112,14 @@ export default {
opacity: 0; opacity: 0;
z-index: 2; z-index: 2;
} }
.ad-full-height{ .ad-box-full{
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
}
.ad-full-height,.ad-full-height image{
height: 100% !important; height: 100% !important;
} }
</style> </style>
manifest.json
View file @ 6a7318ef
{ {
"name" : "mallapp", "name" : "mallapp",
"appid" : "", "appid" : "__UNI__EE0B83C",
"description" : "", "description" : "",
"versionName" : "1.0.0", "versionName" : "1.0.0",
"versionCode" : "100", "versionCode" : "100",
......
pages/index/index.vue
View file @ 6a7318ef
...@@ -1568,5 +1568,6 @@ ...@@ -1568,5 +1568,6 @@
.content .flex-column .full-col{ .content .flex-column .full-col{
flex: 1; flex: 1;
height: 1px; height: 1px;
position: relative;
} }
</style> </style>
pages/kotra/BrandEnterSetIn/enterIndex.vue
View file @ 6a7318ef
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
> >
<span>原因:{{ dataOne.RejectRemark }}</span> <span>原因:{{ dataOne.RejectRemark }}</span>
</view> </view>
<view v-for="(item, index) in stepOneList" :key="index"> <view v-for="(item, index) in setList" :key="index">
<view class="itemBox"> <view class="itemBox">
<view class="name"> <view class="name">
{{ item.name }} {{ item.name }}
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
v-if="!businessLicenseUploadIsSuccess" v-if="!businessLicenseUploadIsSuccess"
class="conImage" class="conImage"
mode="widthFix" mode="widthFix"
@click="chooseImg" @click="chooseImg(item.field)"
></image> ></image>
<!-- 上传成功 --> <!-- 上传成功 -->
<image <image
...@@ -109,11 +109,22 @@ ...@@ -109,11 +109,22 @@
nowStatus != 3 && nowStatus != 3 &&
nowStatus != 5 nowStatus != 5
" "
@click="chooseImg" @click="chooseImg(item.field)"
> >
重新上传 重新上传
</view> </view>
</view> </view>
<view class="con1" v-if="item.type == 4">
<uni-section title="" type="line">
<uni-data-select
v-model="dataOne[item.field]"
lable="ClassName"
defItem="ID"
:localdata="typeList"
:clear="false"
></uni-data-select>
</uni-section>
</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -187,12 +198,6 @@ ...@@ -187,12 +198,6 @@
:datas="dataOne" :datas="dataOne"
></carrierInformation> ></carrierInformation>
</view> </view>
<template v-if="ChooseidentityId == 3">
<enterInformation ref="enterinfo" :datas="dataOne"></enterInformation>
</template>
<template v-if="ChooseidentityId == 4">
<buildingInformation ref="buildinginfo" :datas="dataOne"></buildingInformation>
</template>
</view> </view>
<view v-if="step != 3"> <view v-if="step != 3">
...@@ -202,21 +207,17 @@ ...@@ -202,21 +207,17 @@
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import rangeSlider from "./components/range-slider.vue"; import rangeSlider from "./components/range-slider.vue";
import carrierInformation from "./components/carrierInformation.vue"; import carrierInformation from "./components/carrierInformation.vue";
import buildingInformation from "./components/buildingInformation.vue"; import brandInformation from "./components/brandInformation.vue";
import brandInformation from "./components/brandInformation.vue"; export default {
import enterInformation from "./components/enterInformation.vue";
export default {
components: { components: {
rangeSlider, rangeSlider,
carrierInformation, carrierInformation,
buildingInformation,
brandInformation, brandInformation,
enterInformation,
}, },
computed: {}, computed: {},
data() { data() {
...@@ -226,7 +227,7 @@ export default { ...@@ -226,7 +227,7 @@ export default {
nextIcon: nextIcon:
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/next.png", "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/next.png",
percent: 33.33, percent: 33.33,
ChooseidentityId: 1,//1品牌 2载体 3企业 4楼宇 ChooseidentityId: 1,
stepName: "第1步 企业基础资料", stepName: "第1步 企业基础资料",
nextSepName: "第2步", nextSepName: "第2步",
// type=1：输入框，2：照片 // type=1：输入框，2：照片
...@@ -265,7 +266,7 @@ export default { ...@@ -265,7 +266,7 @@ export default {
type: 1, type: 1,
}, },
], ],
//type=1：输入框，2：步进器，3：多选 //type=1：输入框，2：步进器，3：多选 4.单项
stepTwoList: [ stepTwoList: [
{ {
name: "品牌名称", name: "品牌名称",
...@@ -275,31 +276,100 @@ export default { ...@@ -275,31 +276,100 @@ export default {
type: 1, type: 1,
}, },
{ {
name: "店铺数量", name: "品牌LOGO",
text: "", text: "请上传品牌LOGO",
field: "ShopNum", field: "Logo",
delIcon: false,
type: 2, type: 2,
}, },
{ {
name: "店铺面积", name: "品牌介绍图",
text: "", text: "请上传品牌介绍图",
field: "", field: "BannerList",
type: 3, delIcon: true,
type: 2,
},
{
name: "品牌视频",
text: "请上传品牌视频",
field: "VideoUrl",
delIcon: true,
type: 2,
}, },
{ {
name: "品牌定位", name: "品牌定位",
text: "请输入品牌定位", text: "请输入品牌定位",
field: "FullBrandName", field: "BrandType",
type: 1,
},
{
name: "店铺数量",
text: "请输入店铺数量",
field: "ShopNum",
type: 1,
},
{
name: "需求面积",
text: "请输入需求面积",
field: "AreaRequirement",
type: 1,
},
{
name: "客群定位",
text: "请输入客群定位",
field: "CustomerType",
delIcon: false, delIcon: false,
type: 1, type: 1,
}, },
{ {
name: "客户群体", name: "品牌分类",
tip: "(可多选)", tip: "",
text: "", text: "",
field: "CustomerType", field: "CategoryId",
type: 4, type: 4,
}, },
{
name: "品牌简介",
text: "请输入品牌简介",
field: "Introduce",
delIcon: false,
type: 1,
},
{
name: "物业需求",
text: "请输入物业需求",
field: "PropertyDemand",
delIcon: false,
type: 1,
},
{
name: "意向合作条件",
text: "请输入意向合作条件",
field: "Cooperation",
delIcon: false,
type: 1,
},
{
name: "配套需求",
text: "请输入配套需求",
field: "Complementary",
delIcon: false,
type: 1,
},
{
name: "联系人",
text: "请输入联系人",
field: "ContactName",
delIcon: false,
type: 1,
},
{
name: "联系电话",
text: "请输入联系电话",
field: "ContactPhone",
delIcon: false,
type: 1,
},
], ],
customList: [], //客户群体 customList: [], //客户群体
//type=1：输入框，2：单选，3：范围 //type=1：输入框，2：单选，3：范围
...@@ -340,16 +410,53 @@ export default { ...@@ -340,16 +410,53 @@ export default {
Mobile: "", Mobile: "",
CompanyStatus: 0, CompanyStatus: 0,
FirstShopType: 1, FirstShopType: 1,
// 品牌入驻
BrandName: "",//品牌名
ShopNum: null,//店铺数量
BuiltUpArea: 0,
EndBuiltUpArea: 0,
FullBrandName: "",//品牌全名
CustomerType: "",//客群定位
CustomerOtherType: "",
ID: 0,
Logo: "",
BannerList: "",
VideoUrl: "",
BrandType: "",//品牌定位
AreaRequirement: "",//需求面积
CategoryId: "",
Introduce: "",//品牌简介/企业简介
PropertyDemand: "",//物业需求
Cooperation: "",//意向合作条件
Complementary: "",//配套需求
ContactName: "",//联系人
ContactPhone: "",//联系电话
}, },
dataTwo: { dataTwo: {
CompanyId: 0, CompanyId: 0,
BrandName: "", BrandName: "",//品牌名
ShopNum: 0, ShopNum: 0,//店铺数量
BuiltUpArea: 0, BuiltUpArea: 0,
EndBuiltUpArea: 0, EndBuiltUpArea: 0,
FullBrandName: "", FullBrandName: "",//品牌全名
CustomerType: "", CustomerType: "",//客群定位
CustomerOtherType: "", CustomerOtherType: "",
ID: 0,
Logo: "",
BannerList: "",
VideoUrl: "",
BrandType: "",//品牌定位
AreaRequirement: "",//需求面积
CategoryId: "",
Introduce: "",//品牌简介/企业简介
PropertyDemand: "",//物业需求
Cooperation: "",//意向合作条件
Complementary: "",//配套需求
ContactName: "",//联系人
ContactPhone: "",//联系电话
}, },
reduceIcon: reduceIcon:
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/reduceIcon.png", "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/reduceIcon.png",
...@@ -378,6 +485,9 @@ export default { ...@@ -378,6 +485,9 @@ export default {
nowStatus: 1, //此时的状态 nowStatus: 1, //此时的状态
loading: false, loading: false,
editType: 0, //是否是从修改进入的 1是 0否 editType: 0, //是否是从修改进入的 1是 0否
TenantId: 18,
replace: null,
setList:[],
}; };
}, },
methods: { methods: {
...@@ -420,7 +530,7 @@ export default { ...@@ -420,7 +530,7 @@ export default {
}); });
}, },
//选择营业执照照片 //选择营业执照照片
chooseImg() { chooseImg(field) {
let that = this; let that = this;
uni.chooseImage({ uni.chooseImage({
count: 1, //默认9 count: 1, //默认9
...@@ -443,13 +553,20 @@ export default { ...@@ -443,13 +553,20 @@ export default {
} else { } else {
let data = _res.data.words_result; let data = _res.data.words_result;
that.upFile(res.tempFilePaths[0], (uploadRes) => { that.upFile(res.tempFilePaths[0], (uploadRes) => {
that.dataOne.BusinessLicense = JSON.parse( console.log(field,'======')
that.dataOne[field] = JSON.parse(
uploadRes.data uploadRes.data
).data; ).data;
that.businessLicenseUploadIsSuccess = true; that.businessLicenseUploadIsSuccess = true;
if(this.replace.state=='1') {
that.dataOne.CompanyName = data.单位名称.words; that.dataOne.CompanyName = data.单位名称.words;
that.dataOne.LegalPerson = data.法人.words; that.dataOne.LegalPerson = data.法人.words;
that.dataOne.UnifiedCode = data.社会信用代码.words; that.dataOne.UnifiedCode = data.社会信用代码.words;
}else{
that.dataOne.BrandName = data.品牌名称.words;
that.dataOne.ContactName = data.联系人.words;
}
}); });
} }
}); });
...@@ -521,13 +638,13 @@ export default { ...@@ -521,13 +638,13 @@ export default {
getAccess_token() { getAccess_token() {
let that = this; let that = this;
uni.request({ uni.request({
url: "https://aip.baidubce.com/oauth/2.0/token", // 百度获取token接口地址 url: "https://aip.baidubce.com/oauth/2.0/token?grant_type=client_credentials&client_id=uHc6N5qsYBfZs3jrM0DOLXCc&client_secret=8LrTrMzUmBQGPTEu1Nm0UxaVGucXdg6J", // 百度获取token接口地址
data: { data: {
grant_type: "client_credentials", // 固定写死 grant_type: "client_credentials", // 固定写死
client_id: "wWtW3xQju14uH0ToPpxlk4aq", client_id: "uHc6N5qsYBfZs3jrM0DOLXCc",
client_secret: "lEYPHN0CgFbX5e849ViK9Q7WdnUhkwEx", client_secret: "8LrTrMzUmBQGPTEu1Nm0UxaVGucXdg6J",
}, },
method: "GET", method: "POST",
success(res) { success(res) {
that.access_token = res.data.access_token; that.access_token = res.data.access_token;
}, },
...@@ -536,10 +653,14 @@ export default { ...@@ -536,10 +653,14 @@ export default {
}, },
//企业认证 //企业认证
stepOne() { stepOne() {
console.log('-----')
return return
this.dataOne.FirstShopType = this.ChooseidentityId; this.dataOne.FirstShopType = this.ChooseidentityId;
let url = ""
if(this.replace.state=='1') url = "/api/AppletTrade/SetBrandEnterpriseApplyFor"
else url = "/api/AppletTrade/SetEnterpriseServicesApply"
let parms = { let parms = {
url: "/api/AppletTrade/SetCompany", url: url,
data: this.dataOne, data: this.dataOne,
}; };
this.request2(parms, (res) => { this.request2(parms, (res) => {
...@@ -702,13 +823,46 @@ export default { ...@@ -702,13 +823,46 @@ export default {
} }
} }
}, },
GetBrandClassList() {
let BrandCategory = ''
if(this.TenantId!=18) BrandCategory = this.replace.state=='1' ? 3 : 4
this.request2(
{
url: "/api/AppletTrade/GetBrandClassList",
data: {
BrandCategory
},
},
(res) => {
if (res.resultCode == 1) {
let obj = {
ID: 0,
ClassName: "全部",
};
this.typeList = res.data;
// this.typeList.unshift(obj);
}
}
);
},
}, },
onLoad(options) { onLoad(options) {
let uid = uni.getStorageSync("mall_UserInfo")
this.TenantId = uid.TenantId
this.replace = uni.getStorageSync('replace_page_index')
if(this.replace.state=='1') {
this.setList = JSON.parse(JSON.stringify(this.stepTwoList))
}else {
this.setList = JSON.parse(JSON.stringify(this.stepOneList))
}
if (options && options.editType) { if (options && options.editType) {
//是否是从修改进去的 //是否是从修改进去的
this.editType = options.editType; this.editType = options.editType;
} }
this.getUserCompany(); this.getUserCompany();
this.GetBrandClassList()
}, },
created() {}, created() {},
mounted() { mounted() {
...@@ -719,11 +873,11 @@ export default { ...@@ -719,11 +873,11 @@ export default {
title: this.pageTitle, title: this.pageTitle,
}); });
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.page { .page {
background-color: #f6f6f6; background-color: #f6f6f6;
min-height: 100vh; min-height: 100vh;
height: 100%; height: 100%;
...@@ -971,55 +1125,55 @@ export default { ...@@ -971,55 +1125,55 @@ export default {
font-weight: 500; font-weight: 500;
color: #b7b7b7; color: #b7b7b7;
} }
} }
.chooseType { .chooseType {
background-color: #f95771ff !important; background-color: #f95771ff !important;
color: #f70027 !important; color: #f70027 !important;
border: none !important; border: none !important;
} }
// 修改滑块样式 // 修改滑块样式
/deep/.block { /deep/.block {
background-color: #ffffff; background-color: #ffffff;
border: 4rpx solid #f70027; border: 4rpx solid #f70027;
box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(232, 76, 100, 0.74); box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(232, 76, 100, 0.74);
border-radius: 10rpx; border-radius: 10rpx;
} }
.rangeSliderNum { .rangeSliderNum {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
color: #000000; color: #000000;
} }
/deep/.u-radio-group { /deep/.u-radio-group {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
} }
/deep/.u-radio-group :nth-child(2n) > .u-radio { /deep/.u-radio-group :nth-child(2n) > .u-radio {
margin-right: 0rpx; margin-right: 0rpx;
} }
/deep/.u-radio { /deep/.u-radio {
position: relative; position: relative;
width: 278rpx; width: 278rpx;
border-radius: 18rpx; border-radius: 18rpx;
margin-right: 30rpx; margin-right: 30rpx;
} }
/deep/.u-radio__icon-wrap { /deep/.u-radio__icon-wrap {
position: absolute; position: absolute;
top: 17rpx; top: 17rpx;
right: 17rpx; right: 17rpx;
z-index: 10; z-index: 10;
} }
.sliderCurNumBox { .sliderCurNumBox {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: baseline; align-items: baseline;
...@@ -1031,5 +1185,6 @@ export default { ...@@ -1031,5 +1185,6 @@ export default {
font-weight: 800; font-weight: 800;
color: #f70027; color: #f70027;
} }
} }
</style> </style>
\ No newline at end of file
pages/kotra/identification.vue
View file @ 6a7318ef
...@@ -511,13 +511,13 @@ export default { ...@@ -511,13 +511,13 @@ export default {
getAccess_token() { getAccess_token() {
let that = this; let that = this;
uni.request({ uni.request({
url: "https://aip.baidubce.com/oauth/2.0/token", // 百度获取token接口地址 url: "https://aip.baidubce.com/oauth/2.0/token?grant_type=client_credentials&client_id=uHc6N5qsYBfZs3jrM0DOLXCc&client_secret=8LrTrMzUmBQGPTEu1Nm0UxaVGucXdg6J", // 百度获取token接口地址
data: { data: {
grant_type: "client_credentials", // 固定写死 grant_type: "client_credentials", // 固定写死
client_id: "wWtW3xQju14uH0ToPpxlk4aq", client_id: "uHc6N5qsYBfZs3jrM0DOLXCc",
client_secret: "lEYPHN0CgFbX5e849ViK9Q7WdnUhkwEx", client_secret: "8LrTrMzUmBQGPTEu1Nm0UxaVGucXdg6J",
}, },
method: "GET", method: "POST",
success(res) { success(res) {
that.access_token = res.data.access_token; that.access_token = res.data.access_token;
}, },
......
pages/kotra/news.vue
View file @ 6a7318ef
...@@ -86,6 +86,7 @@ ...@@ -86,6 +86,7 @@
margin-bottom: 30rpx; margin-bottom: 30rpx;
padding: 0px 15px; padding: 0px 15px;
" "
v-if="tenantId==18"
> >
<image <image
@click="goNewFirstShop" @click="goNewFirstShop"
...@@ -110,6 +111,7 @@ ...@@ -110,6 +111,7 @@
style="height: calc(100vh - 189px)" style="height: calc(100vh - 189px)"
> >
<view <view
v-if="tenantId==18"
style="font-size: 30rpx; font-weight: 700; color: #111; padding: 0 15px" style="font-size: 30rpx; font-weight: 700; color: #111; padding: 0 15px"
>资讯信息</view >资讯信息</view
> >
...@@ -146,7 +148,7 @@ ...@@ -146,7 +148,7 @@
</view> </view>
</view> </view>
</view> </view>
<view style="height: 30px;"></view>
<u-loadmore <u-loadmore
:status="status" :status="status"
:load-text="loadText" :load-text="loadText"
...@@ -191,6 +193,7 @@ export default { ...@@ -191,6 +193,7 @@ export default {
status: "", status: "",
CommpanyStatus: 0, //公司认证状态 CommpanyStatus: 0, //公司认证状态
FirstShopType: 0, //1：品牌，2：载体 FirstShopType: 0, //1：品牌，2：载体
tenantId:0
}; };
}, },
onShareTimeline() { onShareTimeline() {
...@@ -252,9 +255,6 @@ export default { ...@@ -252,9 +255,6 @@ export default {
}; };
}, },
mounted() { mounted() {
uni.setNavigationBarTitle({
title: this.pageTitle,
});
this.u = uni.getStorageSync("mall_UserInfo"); this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) { if (!this.u) {
this.u = { this.u = {
...@@ -263,11 +263,15 @@ export default { ...@@ -263,11 +263,15 @@ export default {
}; };
this.showAuth = true; this.showAuth = true;
} else { } else {
this.tenantId = this.u.TenantId
this.getList(1); this.getList(1);
this.getCommpanyStatus(); this.getCommpanyStatus();
this.isauth = true this.isauth = true
this.pageTitle = this.tenantId==18?this.pageTitle:'商业资讯'
} }
uni.setNavigationBarTitle({
title: this.pageTitle,
});
}, },
methods: { methods: {
reloadUserinfo() { reloadUserinfo() {
......
plugin/api.js
View file @ 6a7318ef
...@@ -2,8 +2,8 @@ export default { ...@@ -2,8 +2,8 @@ export default {
install(Vue, options) { install(Vue, options) {
Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285" Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285"
//Vue.prototype.host2 = "https://mallApi.oytour.com" //电商接口 Vue.prototype.host2 = "https://mallApi.oytour.com" //电商接口
Vue.prototype.host2 = "http://192.168.5.46:8200" //Vue.prototype.host2 = "http://192.168.5.46:8200"
Vue.prototype.host3 = "https://jjeduapi.oytour.com" //进阶小课堂以前接口 Vue.prototype.host3 = "https://jjeduapi.oytour.com" //进阶小课堂以前接口
Vue.prototype.UploadConfig = function() { //本地上传配置 Vue.prototype.UploadConfig = function() { //本地上传配置
......
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