Skip to content

M
mallapp
Commit f1a6bbbe authored by Mac's avatar Mac
Browse files
Options

修改

parent 013bb57c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1189 additions and 427 deletions
pages.json
View file @ f1a6bbbe
......@@ -690,11 +690,11 @@
},{
"path":"brand/list"//品牌列表
},{
"path":"brand/detail",//品牌详情
"enablePullDownRefresh": true,
"style": {
"navigationStyle": "custom"
}
"path":"brand/detail"//品牌详情
// "enablePullDownRefresh": true,
// "style": {
// "navigationStyle": "custom"
// }
},
{
"path":"brand/detail_new"//品牌详情-新版
......
pages/kotra/brand/detail.vue
View file @ f1a6bbbe
This diff is collapsed.
pages/kotra/brand/old_detail.vue 0 → 100644
View file @ f1a6bbbe
This diff is collapsed.
pages/kotra/brandInformation.vue
View file @ f1a6bbbe
......@@ -663,6 +663,14 @@
this.glBrandName = data.BrandName
this.disabled2 = true
this.disabled3 = true
if(this.model.BannerList.length>0){
this.model.BannerList.forEach(x=>{
let obj ={
url:x
}
this.fileList.push(obj)
})
}
this.BrandClassList.forEach(x=>{
if(this.model.BrandClassId == x.ID){
this.BrandClassName = x.ClassName;
......
pages/kotra/wish/detail.vue
View file @ f1a6bbbe
<template>
<view class="detail">
<scroll-view scroll-y="true" style="height: 100vh;">
<view style="box-shadow: 0px 5px 25px 0px rgba(218, 220, 230, 0.85);margin-bottom: 20px;border-radius: 10px;">
<view class="top">
<view class="submit-date">
提交日期：2021.07.02
提交日期：{{datas.UpdateDate}}
</view>
<view class="modify-btn">
<view class="modify-btn" @click="goedit()">
修改
</view>
</view>
<view class="detail-con">
<view class="title">
兰蔻小黑瓶肌底液最强一代
{{datas.BranchName}}
</view>
<view class="con1">
<text class="">
对标载体：万达广场
</text>
<text class="">
发展区域：锦江区
</text>
<view class="con1_item">
对标载体：{{datas.CarrierName}}
</view>
<view class="con1_item">
发展区域：{{datas.Area}}
</view>
</view>
<view class="title2">
清单详情
<u-divider :margin-top="20" :margin-bottom="20" half-width="100" color="#0B0B0B" fontSize='32' bg-color="transparent">清单详情</u-divider>
<view >
<h-parse :content="datas.Description" @navigate="clickDescription"></h-parse>
</view>
<u-divider :margin-top="20" :margin-bottom="20" half-width="100" color="#0B0B0B" fontSize='32' bg-color="transparent">我的名片</u-divider>
<view style="width: 100%;" @click="previewImage([datas.NameCard],1)" >
<image :src='datas.NameCard' mode="aspectFill" style="width: 100%;height: 362rpx;border-radius: 10px;"></image>
</view>
</view>
</scroll-view>
</view>
</view>
</template>
<script>
import hParse from "@/components/u-parse/parse.vue";
export default{
components: {
hParse
},
data(){
return{
WishId:0,
datas:null
}
},
onLoad(options) {
if(options && options.Id){
this.WishId = options.Id
}
this.getdetails()
},
created() {
uni.setNavigationBarTitle({
title: "心愿清单详情"
})
},
methods:{
getdetails(){
let parms = {
url: "/api/AppletTrade/GetMyWishInfo",
data:{WishId:this.WishId}
}
this.request2(parms, (res) => {
this.loading = false;
if (res.resultCode == 1) {
this.datas = res.data
}
})
},
clickDescription(){
},
previewImage(imgs,i) {
uni.previewImage({
urls: imgs,
current: i,
longPressActions: {
itemList: ["发送给朋友", "保存图片", "收藏"],
success: function(data) {},
fail: function(err) {
console.log(err.errMsg);
},
},
});
},
goedit(){
uni.navigateTo({
url: '/pages/kotra/wish/myWishPlan?Id='+this.datas.Id +'&type=3'
})
}
}
}
</script>
......@@ -50,6 +102,10 @@
<style lang="scss" scoped>
.detail{
font-family: PingFang SC;
width: 100%;
height: 100vh;
background: #FFF;
padding: 15px;
.top{
height: 240rpx;
padding-top: 50rpx;
......@@ -75,12 +131,12 @@
}
}
.detail-con{
width: 690rpx;
margin: 0 auto;
background-color: #FFFFFF;
box-shadow: 0px 10rpx 50rpx 0px rgba(218, 220, 230, 0.85);
border-radius: 20rpx;
padding: 55rpx 55rpx 75rpx 55rpx;
padding: 15px;
.title{
font-size: 38rpx;
font-weight: 800;
......@@ -91,11 +147,14 @@
.con1{
display: flex;
justify-content: space-between;
align-items: center;
align-items: flex-start;
font-size: 24rpx;
font-weight: 500;
color: #80808A;
margin-bottom: 60rpx;
.con1_item{
width: 49%;
}
}
.title2{
text-align: center;
......
pages/kotra/wish/list.vue
View file @ f1a6bbbe
<template>
<view>
<view style="width: 100%;height: 100vh;">
<view class="fbanniu" @click="btnclick">
<u-icon name="plus" color="#FFF" size='30'></u-icon>
<!-- <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/fabupyq.png" style="height: 26rpx;" mode="aspectFit"></image> -->
<text style="font-size: 10px;color: #FFF;">新增</text>
</view>
<u-empty v-if="dataList.length == 0" text="暂无数据" mode="list" class="noBox"></u-empty>
<view class="list-box" v-if="dataList.length > 0">
<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower"
style="height: 100%;">
<view v-for="(item,index) in dataList" :key="index" class="wish-item">
<view v-for="(item,index) in dataList" :key="index" class="wish-item" @click="goDetail(item.Id)">
<view class="name">
{{item.name}}
{{item.BranchName}}
</view>
<view class="flex">
<view class="addr flex">
<u-icon name="location" color="#F40329"></u-icon>{{item.addr}}
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/floor_red.png" style="width: 13px;height: 12px;margin-right: 5px;"></image>
{{item.CarrierName}}
</view>
<view class="addr flex">
<u-icon name="location" color="#F40329"></u-icon>{{item.location}}
<view class="addr flex" style="margin-left: 10px;">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/address_red.png" style="width: 9px;height: 13px;margin-right: 5px;"></image>
{{item.Area}}
</view>
</view>
<view class="con" @click="goDetail">
{{item.con}}
<view class="con" >
<view v-html='item.Description' style="width: 100%;height: 50px;overflow: hidden;"></view>
</view>
<view class="flex between-center">
<view class="flex between-center" style="margin-top: 10px;">
<view class="date">
{{item.date}}
{{item.UpdateDate}}
</view>
<view class="">
编辑
<view class="" @click.stop="goedit(item.Id)">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/edit_black.png" style="width: 13px;height: 13px;"></image>
</view>
</view>
</view>
<u-loadmore :status="status" :load-text="loadText" :font-size="24" :margin-top="20" :margin-bottom="20"
bg-color="#F6F6F6" />
bg-color="#FFFFFF" />
</scroll-view>
</view>
<!-- 加载中 -->
......@@ -53,54 +61,14 @@
active: 0,
searchKey:"",
typeList: [],
dataList:[
{
name:"兰蔻小黑瓶肌底液最强一代",
addr:"武侯区",
location:"万达广场",
con:"这里显示详情介绍，这里显示详情介绍，这里显示详情介绍，这里显示详情介绍，这里显示详情介绍，这里显示详情",
date:"2021-07-02",
},
{
name:"兰蔻小黑瓶肌底液最强一代",
addr:"武侯区",
location:"万达广场",
con:"这里显示详情介绍，这里显示详情介绍，这里显示详情介绍，这里显示详情介绍，这里显示详情介绍，这里显示详情",
date:"2021-07-02",
},
{
name:"兰蔻小黑瓶肌底液最强一代",
addr:"武侯区",
location:"万达广场",
con:"这里显示详情介绍，这里显示详情介绍，这里显示详情介绍，这里显示详情介绍，这里显示详情介绍，这里显示详情",
date:"2021-07-02",
},
{
name:"兰蔻小黑瓶肌底液最强一代",
addr:"武侯区",
location:"万达广场",
con:"这里显示详情介绍，这里显示详情介绍，这里显示详情介绍，这里显示详情介绍，这里显示详情介绍，这里显示详情",
date:"2021-07-02",
},
{
name:"兰蔻小黑瓶肌底液最强一代",
addr:"武侯区",
location:"万达广场",
con:"这里显示详情介绍，这里显示详情介绍，这里显示详情介绍，这里显示详情介绍，这里显示详情介绍，这里显示详情",
date:"2021-07-02",
},
],
dataList:[],
msg:{
pageIndex:1,
pageSize:10,
MetroName:"",
UserId:"",
BranchName:"",
CarrierName:"",
MetroNum:"",
Developers:"",
StartOpenTime:"",
EndOpenTime:"",
ProjectType:0,
OrderBy:0
},
loading: false,
pageCount:0,
......@@ -130,39 +98,15 @@
uni.setNavigationBarTitle({
title: '心愿清单列表',
});
this.msg.UserId = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo").UserId:'0'
this.getCarrierPageList()
},
methods: {
// 获取载体列表
getTypeList(){
let parms = {
url: "/api/AppletTrade/GetProjectTypeEnumList",
}
this.request2(parms, (res) => {
if (res.resultCode == 1) {
// this.pageCount = res.data.pageCount
this.typeList.push({
Id:0,
Name:"全部"
})
this.typeList = this.typeList.concat(res.data)
if(this.msg.ProjectType ==0){
}else{//指定跳入分类
this.typeList.map((x,i)=>{
if(x.Id== this.msg.ProjectType){
this.active = i;
}
})
}
}
})
this.getCarrierPageList()
},
// 获取载体分页列表
getCarrierPageList(){
let parms = {
url: "/api/AppletTrade/GetCarrierPageList",
url: "/api/AppletTrade/GetMyWishPageList",
data:this.msg
}
this.request2(parms, (res) => {
......@@ -176,25 +120,7 @@
}
})
},
changeHandler(i) {
this.active = i;
this.msg.ProjectType = this.typeList[i].Id;
this.msg.pageIndex = 1;
this.dataList= [];
this.getCarrierPageList()
},
openGood(id,type) {
uni.navigateTo({
url: '/pages/kotra/carrier/detail?id=' + id+"&&type="+type,
});
},
searchHandler(val){
this.msg.CarrierName=val
this.msg.pageIndex = 1;
this.dataList= [];
this.getCarrierPageList()
},
//触底事件
lower(e) {
if (this.msg.pageIndex < this.pageCount) {
......@@ -205,9 +131,20 @@
this.status = "nomore";
}
},
goDetail(){
goDetail(id){
console.log(id)
uni.navigateTo({
url: '/pages/kotra/wish/detail?Id='+id
})
},
btnclick(){//新增心愿
uni.navigateTo({
url: '/pages/kotra/wish/detail'
url: '/pages/kotra/wish/myWishPlan'
})
},
goedit(Id){
uni.navigateTo({
url: '/pages/kotra/wish/myWishPlan?Id='+Id +'&type=2'
})
}
}
......@@ -231,9 +168,9 @@
}
.wish-item{
width: 690rpx;
height: 297rpx;
margin: 0 auto 34rpx;
padding: 40rpx 30rpx;
padding: 30rpx;
background-color: #FFFFFF;
box-shadow: 0rpx 10rpx 50rpx 0rpx rgba(218, 220, 230, 0.85);
border-radius: 30rpx;
......@@ -249,6 +186,7 @@
font-weight: 500;
color: #999999;
margin-bottom: 20rpx;
align-items: center;
}
.con{
font-size: 24rpx;
......@@ -265,5 +203,20 @@
color: #BCBCBC;
}
}
.fbanniu{
width: 42px;
height: 42px;
border-radius: 21px;
position: fixed;
right: 20rpx;
bottom: 180rpx;
background: #40766E;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
z-index: 99;
}
</style>
pages/kotra/wish/myWishPlan.vue
View file @ f1a6bbbe
......@@ -53,7 +53,6 @@
justify-content: center;
margin-top: 20px;
}
}
}
......@@ -68,31 +67,31 @@
<view class="box_text">
<view class="box_text_l">品牌信息</view>
<view class="box_text_r">
<input type="text" v-model="addMsg.pinpai" :min='0' placeholder="输入品牌信息" style="font-size: 12px;text-align: right;">
<input type="text" v-model="addMsg.BranchName" :min='0' placeholder="输入品牌信息" style="font-size: 12px;text-align: right;">
</view>
</view>
<view class="box_text">
<view class="box_text_l">对标载体</view>
<view class="box_text_r">
<input type="text" v-model="addMsg.duibiaozhaiti" :min='0' placeholder="输入对标载体名称" style="font-size: 12px;text-align: right;">
<input type="text" v-model="addMsg.CarrierName" :min='0' placeholder="输入对标载体名称" style="font-size: 12px;text-align: right;">
</view>
</view>
<view class="box_text">
<view class="box_text_l">发展区域</view>
<view class="box_text_r">
<input type="text" v-model="addMsg.fazhannquyu" :min='0' placeholder="输入区域" style="font-size: 12px;text-align: right;">
<input type="text" v-model="addMsg.Area" :min='0' placeholder="输入区域" style="font-size: 12px;text-align: right;">
</view>
</view>
<view class="box_text" style="border-bottom: none;">
<view class="box_text_l">心愿详细</view>
</view>
<view @click="gorichText">
<view class="boxxq" v-if="addMsg.Content==''" style="display: flex;flex-direction: column;align-items: center;justify-content: center;">
<view class="boxxq" v-if="addMsg.Description==''" style="display: flex;flex-direction: column;align-items: center;justify-content: center;">
<image mode="aspectFill" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/wish-edit.png" style="width: 50px;height: 50px;"></image>
<view style="font-size: 14px;color: #1F1F1F;margin-top: 10px;">点击进入编辑>></view>
</view>
<view class="boxxq" v-if="addMsg.Content!=''">
<view v-html='addMsg.Content' style="width: 100%;overflow: hidden;"></view>
<view class="boxxq" v-if="addMsg.Description!=''" style="padding: 15px;">
<view v-html='addMsg.Description' style="width: 100%;overflow: hidden;"></view>
<view style="font-size: 14px;color: #1F1F1F;margin: 10px 0;width: 100%;text-align: center;">继续编辑>></view>
</view>
......@@ -102,12 +101,12 @@
<view class="box_text_l">我的名片</view>
</view>
<view @click="uploadcard">
<view class="boxxq" v-if="addMsg.mymp==''" style="display: flex;flex-direction: column;align-items: center;justify-content: center;">
<view class="boxxq" v-if="addMsg.NameCard==''" style="display: flex;flex-direction: column;align-items: center;justify-content: center;">
<image mode="aspectFill" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/wish-card.png" style="width: 60px;height: 46px;"></image>
<view style="font-size: 14px;color: #1F1F1F;margin-top: 10px;">添加名片>></view>
</view>
<view class="boxxq" v-if="addMsg.mymp!=''" style="overflow: hidden;">
<image mode="aspectFill" :src="addMsg.mymp" style="width: 100%px;height: 170px;border-radius: 10px;"></image>
<view class="boxxq" v-if="addMsg.NameCard!=''" style="overflow: hidden;border:none">
<image mode="aspectFill" :src="addMsg.NameCard" style="width: 100%px;height: 170px;border-radius: 10px;"></image>
</view>
</view>
......@@ -128,18 +127,26 @@
return{
mainColor:'',
addMsg:{
pinpai:'',
duibiaozhaiti:'',
fazhannquyu:"",
Content:'',
mymp:'',
Id:0,
BranchName:'',
CarrierName:'',
Area:"",
Description:'',
NameCard:'',
},
WishId:0,
action: this.host2 + "/api/File/UploadTencent",
type:1,//1列表为新增时 2列表修改 3详情修改
}
},
onLoad(options){
if(options && options.Id){
this.WishId = options.Id
this.getdetails()
}
if(options && options.type){
this.type = options.type
}
},
created(){
uni.setNavigationBarTitle({
......@@ -150,36 +157,48 @@
this.mainColor = this.$uiConfig.mainColor;
},
methods:{
getdetails(){
let parms = {
url: "/api/AppletTrade/GetMyWishInfo",
data:{WishId:this.WishId}
}
this.request2(parms, (res) => {
this.loading = false;
if (res.resultCode == 1) {
this.addMsg = res.data
}
})
},
submit(){//提交
if(this.addMsg.pinpai == ''){
if(this.addMsg.BranchName == ''){
uni.showToast({
title:'请输入品牌信息',
icon:'none'
})
return
}
if(this.addMsg.duibiaozhaiti == ''){
if(this.addMsg.CarrierName == ''){
uni.showToast({
title:'请输入对标载体',
icon:'none'
})
return
}
if(this.addMsg.fazhannquyu == ''){
if(this.addMsg.Area == ''){
uni.showToast({
title:'请输入发展区域',
icon:'none'
})
return
}
if(this.addMsg.Content == ''){
if(this.addMsg.Description == ''){
uni.showToast({
title:'请输入心愿详细',
icon:'none'
})
return
}
if(this.addMsg.mymp == ''){
if(this.addMsg.NameCard == ''){
uni.showToast({
title:'请上传我的名片',
icon:'none'
......@@ -190,13 +209,38 @@
title:'提交中...',
icon:'none'
})
//接口
setTimeout(()=>{
let parms = {
url: "/api/AppletTrade/SetMyWishInfo",
data:this.addMsg
}
let pages = getCurrentPages(); // 当前页面
let beforePage = pages[pages.length - 2]; // 前一个页面
let that = this
this.request2(parms, (res) => {
uni.hideLoading()
},4000)
if (res.resultCode == 1) {
uni.showToast({title: res.message,icon: 'none',})
setTimeout(()=>{
uni.navigateBack({
success: function() {
if(that.type==3){//1列表为新增时 2列表修改 3详情修改
beforePage.$vm.getdetails(); // 执行前一个页面的方法
}else if(that.type==1){
beforePage.$vm.getCarrierPageList();
}
}
});
},1000)
}
})
},
gorichText(){
let data = this.addMsg.Content
console.log(this.addMsg.Description)
let data = this.addMsg.Description
data= encodeURIComponent(data)//加密
uni.navigateTo({
url: '/pages/kotra/wish/richText?Content=' +data
......@@ -206,7 +250,7 @@
let regex = new RegExp('<img', 'gi');
let richtext = e
richtext = richtext.replace(regex, `<img width="100%"`); //图片超出的处理
this.addMsg.Content = richtext
this.addMsg.Description = richtext
},
uploadcard(){
uni.chooseImage({
......@@ -231,7 +275,7 @@
success: res => {
let data = JSON.parse(res.data)
// 上传完成后处理
this.addMsg.mymp = data.data
this.addMsg.NameCard = data.data
uni.hideLoading()
},
......
pages/school/Jiaheactivity.vue
View file @ f1a6bbbe
......@@ -120,12 +120,13 @@
justify-content: space-between;
padding: 0 15px;
}
.scroll-box{
height: calc(100vh - 50px);
width: calc(100vw);
overflow: hidden;
padding-bottom:50px ;
}
}
.Jiaheactivity .scroll-box{
height: calc(100vh - 50px);
width: calc(100vw);
overflow: hidden;
padding-bottom:50px ;
}
</style>
<template>
......
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