Skip to content

M
mallapp
Commit b44f1601 authored by 罗超's avatar 罗超
Browse files
Options

临时提交

parent 26cbedf8
Show whitespace changes
Inline Side-by-side
Showing with 709 additions and 596 deletions
pages.json
View file @ b44f1601
......@@ -81,7 +81,7 @@
"root": "pages/live",
"plugins": {
"live-player-plugin": {
"version": "1.1.4",
"version": "1.1.8",
"provider": "wx2b03c6e691cd7370"
}
},
......@@ -265,36 +265,36 @@
"path": "myClients/myClients"
},
{
"path":"wdWithdrawal"
"path": "wdWithdrawal"
},
{
"path":"wdOrder"
"path": "wdOrder"
},
{
"path":"wdCase"
"path": "wdCase"
},
{
"path":"shopSettings"
"path": "shopSettings"
},
{
"path":"storeManagement/storeManagement"
"path": "storeManagement/storeManagement"
},
{
"path":"storeManagement/goodsEdit"
"path": "storeManagement/goodsEdit"
},
{
"path":"storeManagement/addGoods"
"path": "storeManagement/addGoods"
},
{
"path":"storeManagement/index"
"path": "storeManagement/index"
}
]
},
{
"root":"pages/quick_share",
"pages":[{
"root": "pages/quick_share",
"pages": [{
"path": "index"
}]
}
......
pages/goods/goods.vue
View file @ b44f1601
......@@ -462,13 +462,13 @@ export default {
},
initImages() {
// let that = this;
let info = uni.createSelectorQuery().in(this);
info
.select(".goods")
.boundingClientRect((data) => {
console.log("得到布局位置信息" + JSON.stringify(data));
})
.exec();
// let info = uni.createSelectorQuery().in(this);
// info
// .select(".goods")
// .boundingClientRect((data) => {
// console.log("得到布局位置信息" + JSON.stringify(data));
// })
// .exec();
// info
// .boundingClientRect(function (data) {
// console.log(data)
......
pages/order/order-commit.vue 0 → 100644
View file @ b44f1601
<template>
<view class="commit-box">
</view>
</template>
<script>
export default {
}
</script>
<style>
</style>
\ No newline at end of file
pages/quick_share/index.vue
View file @ b44f1601
<style>
.quick_top {
.quick_top {
display: flex;
margin: 10px auto;
}
}
.quick_slider {
.quick_slider {
padding: 5px 17px;
border-radius: 20px;
background-color: #EBEBEB;
background-color: #ebebeb;
color: #272727;
display: inline-block;
font-size: 12px;
margin-left: 10px;
letter-spacing: 2px;
}
}
.quick_arrow {
.quick_arrow {
width: 10%;
}
}
.quick_arrow .u_icon {
.quick_arrow .u_icon {
margin-left: 20%;
line-height: 30px;
color: #cd9621;
font-size: 20px;
}
}
/* .checkedItem {
/* .checkedItem {
background-color: #ff547b;
color: #fff;
} */
.quick_arrow .allTags {
.quick_arrow .allTags {
margin: 20px;
}
}
.allTags_List {
.allTags_List {
padding-bottom: 20px;
}
}
.allTags_List {
.allTags_List {
display: flex;
}
}
.quick_Content {
.quick_Content {
width: 100%;
}
}
.quick_Inner {
.quick_Inner {
display: flex;
justify-content: space-between;
padding:20px;
}
.quick_ImgDiv {
padding: 20px;
}
.quick_Inner:last-child {
margin: 0px !important;
}
.quick_ImgDiv {
width: 40px;
height: 40px;
border-radius: 50%;
overflow: hidden;
}
}
.quick_ImgDiv img {
.quick_ImgDiv img {
width: 100%;
height: 100%;
}
}
.quick_Center {
.quick_Center {
position: relative;
width: 85%;
}
}
.share_Content {
.share_Content {
position: absolute;
right: 0;
top: 0;
......@@ -81,60 +83,88 @@
display: flex;
min-width: 50px;
align-items: center;
}
}
.Quick_Shareicon {
.Quick_Shareicon {
width: 13px;
height: 13px;
margin-right: 5px;
}
}
.Quick_ImgContent {
.Quick_ImgContent {
display: flex;
justify-content: space-between;
}
.quick_page img {
}
.quick_page img {
width: 650rpx;
height: 700rpx;
}
.quick_page .hotsopt {
}
.quick_page .hotsopt {
position: absolute;
background: transparent;
border: none;
outline: none;
}
.quick_page .hotsopt::after {
}
.quick_page .hotsopt::after {
border: none;
}
.qr_DialogBtn{
}
.qr_DialogBtn {
position: absolute;
bottom:30px;
width:80%;
background-color:#FF4048;
color:#fff;
margin:auto;
left:50%;
margin-left:-40%;
bottom: 30px;
width: 80%;
background-color: #ff4048;
color: #fff;
margin: auto;
left: 50%;
margin-left: -40%;
border-radius: 20px;
}
.qr_Line{
width:100%;
height:1px;
background-color: #F4F4F4;
margin:10px 0;
}
}
.qr_Line {
width: 100%;
height: 1px;
background-color: #f4f4f4;
margin: 10px 0 0 0;
}
</style>
<template>
<view :style="{ height: contentHeight }">
<u-tabs name="Name" :list="dataFirst" :is-scroll="false" :current="active" :bar-width="80" :font-size="32"
:active-color="mainColor" @change="getChild"></u-tabs>
<scroll-view scroll-x="true" style="white-space: nowrap;display: flex;margin:10px auto;background-color:#EBEBEB;border-radius:20px;width:95%;overflow:hidden;">
<view @click="getSecond(item,index)" style="padding:8px 17px;margin-left:0;" :style="{ color: index==active2 ? '#fff' : '#272727',backgroundColor:index==active2 ? mainColor:'' }" class="quick_slider" v-for="(item,index) in dataSecond" :key="index">{{item.Name}}</view>
</scroll-view>
<view
class="quick-box"
style="height:100vh;"
:style="{ 'height': `calc(100vh - ${paddingBottm})` }"
>
<view class="quick-head">
<u-tabs
name="Name"
:list="dataFirst"
:is-scroll="false"
:current="active"
:bar-width="80"
:font-size="28"
:active-color="mainColor"
@change="getChild"
></u-tabs>
<view
style="white-space: nowrap;display: flex;margin:10px auto;background-color:#EBEBEB;border-radius:20px;width:95%;overflow:hidden;"
>
<view
@click="getSecond(item,index)"
style="padding:8px 17px;margin-left:0;flex:1;text-align:center;"
:style="{ color: index==active2 ? '#fff' : '#272727',backgroundColor:index==active2 ? mainColor:'' }"
class="quick_slider"
v-for="(item,index) in dataSecond"
:key="index"
>{{item.Name}}</view>
</view>
<view class="qr_Line"></view>
<view class="quick_top" v-if="dataThird.length>0">
<scroll-view scroll-x="true" style="white-space: nowrap;display: flex;width:90%">
<view @click="getThird(item,index)" :style="{ color: index==active3 ? '#fff' : '#272727',backgroundColor:index==active3 ? mainColor:'' }" class="quick_slider" v-for="(item,index) in dataThird" :key="index">{{item.Name}}</view>
<view
@click="getThird(item,index)"
:style="{ color: index==active3 ? '#fff' : '#272727',backgroundColor:index==active3 ? mainColor:'' }"
class="quick_slider"
v-for="(item,index) in dataThird"
:key="index"
>{{item.Name}}</view>
</scroll-view>
<view class="quick_arrow" v-if="dataThird.length>4">
<u-icon class="u_icon" name="arrow-up" v-if="show" @click="show=false"></u-icon>
......@@ -142,29 +172,60 @@
<u-popup v-model="show" mode="top">
<view class="allTags">全部标签</view>
<view class="allTags_List">
<view @click="getThird(item,index)" :class="{'checkedItem':index==active3}" class="quick_slider" v-for="(item,index) in dataThird" :key="index">{{item.Name}}</view>
<view
@click="getThird(item,index)"
:class="{'checkedItem':index==active3}"
class="quick_slider"
v-for="(item,index) in dataThird"
:key="index"
>{{item.Name}}</view>
</view>
</u-popup>
</view>
</view>
<scroll-view :scroll-y="true" style="background-color: #f0f4f7" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ 'height': scrollHeight}">
</view>
<scroll-view
:scroll-y="true"
style="background-color: #f0f4f7;"
:enable-back-to-top="true"
:enable-flex="true"
@scrolltolower="lower"
:style="{ 'height': `calc(100% - ${scrollHeight})`}"
>
<view class="quick_Content" style="width: 100%;min-height:100%">
<view class="quick_Inner" v-for="(item,index) in dataList" :key="index" style="margin-bottom:10px;background-color:#fff;">
<view
class="quick_Inner"
v-for="(item,index) in dataList"
:key="index"
style="margin-bottom:10px;background-color:#fff;"
>
<view class="quick_ImgDiv">
<img :src="item.HeadImg" alt="" />
<img :src="item.HeadImg" alt />
</view>
<view class="quick_Center">
<view style="margin-bottom:10px;">{{item.UserName}}</view>
<view style="margin-bottom:10px;font-weight:bold">{{item.UserName}}</view>
<view v-html="item.MaterialInfo" @click="goUrl(item)" style="margin-bottom:10px;"></view>
<view v-if="item.LinkUrl!=''" @click="goUrl(item)" style="color:#b08b38;margin-bottom:10px;">查看详情</view>
<view
v-if="item.LinkUrl!=''"
@click="goUrl(item)"
style="color:#b08b38;margin-bottom:10px;"
>查看详情</view>
<view v-for="(sItem,i) in imgArr" :key="i">
<view style="flex-direction:row;display:flex;">
<!-- 横排布局 -->
<view v-for="(subItem,index) in item.ImgList" :key="index" style="margin-bottom:3px;">
<view
v-for="(subItem,index) in item.ImgList"
:key="index"
style="margin-bottom:3px;"
>
<!-- 遍历数组 -->
<view v-if="index>=i*3&&index<3*(i+1)" class="flex-item" style="margin-right:5px;">
<view
v-if="index>=i*3&&index<3*(i+1)"
class="flex-item"
style="margin-right:5px;"
>
<!-- 分段显示 -->
<img :src="subItem" style="height:190rpx;width:190rpx;"/>
<img :src="subItem" style="height:190rpx;width:190rpx;" />
</view>
</view>
</view>
......@@ -176,11 +237,25 @@
</view>
</view>
</view>
<u-loadmore :status="status" :load-text="loadText" :font-size="24" :margin-top="20" :margin-bottom="20" bg-color="#f3f4f6" />
<view style="padding:10px 0;background:#FFF">
<u-loadmore
:status="status"
:load-text="loadText"
:font-size="24"
:margin-top="0"
:margin-bottom="0"
bg-color="#fff"
/>
</view>
</scroll-view>
<tabbar></tabbar>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
<u-popup v-model="showDialog" mode="center" :mask-close-able="false" custom-style="padding:0;background:none;">
<u-popup
v-model="showDialog"
mode="center"
:mask-close-able="false"
custom-style="padding:0;background:none;"
>
<view style="position: relative;">
<img src="@/static/images/qrDialog.png" mode="widthFix" />
<button class="qr_DialogBtn" @click="showDialog=false">确定</button>
......@@ -189,18 +264,17 @@
</view>
</template>
<script>
import auth from "@/components/auth/index";
import tabbar from "@/components/tabbar/index";
export default {
import auth from "@/components/auth/index";
import tabbar from "@/components/tabbar/index";
export default {
data() {
return {
show: false,
pageTitle: '分享',
pageTitle: "分享",
loading: true,
showAuth: false,
mainColor: '',
mainColor: "",
u: {},
contentHeight: 0,
msg: {
Name: "", //页面名称
pageIndex: 1,
......@@ -238,50 +312,76 @@
loading: "努力加载中",
nomore: "没有更多了",
},
goodTitle:'', //名称=>传子组件
images:[], //图片=>传子组件
qrHeight:160,
showDialog:false
goodTitle: "", //名称=>传子组件
images: [], //图片=>传子组件
qrHeight: 160,
showDialog: false,
paddingBottm: "0px",
};
},
components: {
auth,
tabbar
tabbar,
},
created() {
this.contentHeight = this.$utils.calcContentHeight(-40) + 'px';
this.scrollHeight = this.$utils.calcContentHeight(-40+this.qrHeight) + 'px';
this.mainColor = this.$uiConfig.mainColor;
},
mounted() {
let currentPages = getCurrentPages();
let u = '/' + currentPages[currentPages.length - 1].route;
let pages = wx.getStorageSync('basedata') ? wx.getStorageSync('basedata').bar_title : [];
pages.forEach(x => {
let u = "/" + currentPages[currentPages.length - 1].route;
let pages = wx.getStorageSync("basedata")
? wx.getStorageSync("basedata").bar_title
: [];
pages.forEach((x) => {
if (x.value == u) {
this.pageTitle = x.new_name ? x.new_name : x.name;
}
});
uni.setNavigationBarTitle({
title: this.pageTitle
title: this.pageTitle,
});
setTimeout(() => {
this.getTabsHeight();
this.getHeadHeight();
}, 1000);
},
onLoad(option) {
this.getList();
this.u = uni.getStorageSync("mall_UserInfo");
},
methods: {
getTabsHeight() {
let that = this;
const query = uni.createSelectorQuery().in(this);
query
.select(".quick-box >>> .tabbarMain")
.boundingClientRect((data) => {
that.paddingBottm = data.height + "px";
})
.exec();
},
getHeadHeight() {
let that = this;
const query = uni.createSelectorQuery().in(this);
query
.select(".quick-head")
.boundingClientRect((data) => {
that.scrollHeight = data.height + "px";
})
.exec();
},
//点击切换
changeHandler(i) {
this.active = i;
},
//获取头部数据
getList() {
this.request2({
url: '/api/Share/GetShareCategoryList',
data: this.msg
this.request2(
{
url: "/api/Share/GetShareCategoryList",
data: this.msg,
},
res => {
(res) => {
var data = res.data;
this.dataFirst = data;
if (data && data.length > 0) {
......@@ -290,21 +390,21 @@
// this.dataThird = data[0].children[0].children
// }
}
if(this.dataFirst.length>0){
this.conMsg.CateId=this.dataFirst[0].Id;
if (this.dataFirst.length > 0) {
this.conMsg.CateId = this.dataFirst[0].Id;
this.getContent();
}
}
);
},
//获取内容
getContent() {
this.request2({
url: '/api/Share/AppGetShareFriendPage',
data: this.conMsg
this.request2(
{
url: "/api/Share/AppGetShareFriendPage",
data: this.conMsg,
},
res => {
(res) => {
if (res.resultCode == 1) {
this.dataList = this.dataList.concat(res.data.pageData);
this.pageCount = res.data.pageCount;
......@@ -312,17 +412,16 @@
}
);
},
getChang(){
if(this.dataThird.length==0){
this.qrHeight=160
}else{
this.qrHeight=196
getChang() {
if (this.dataThird.length == 0) {
this.qrHeight = 160;
} else {
this.qrHeight = 196;
}
this.scrollHeight = this.$utils.calcContentHeight(-40+this.qrHeight) + 'px';
},
//点击一级分类
getChild(index) {
this.dataList=[];
this.dataList = [];
this.active = index;
this.dataSecond = this.dataFirst[index].children;
this.dataThird = [];
......@@ -334,7 +433,7 @@
},
//点击二级分类
getSecond(item, index) {
this.dataList=[];
this.dataList = [];
this.active2 = index;
this.dataThird = item.children;
this.active3 = -1;
......@@ -344,7 +443,7 @@
},
//点击三级分类
getThird(item, index) {
this.dataList=[];
this.dataList = [];
this.active3 = index;
this.show = false;
this.conMsg.CateId = item.Id;
......@@ -352,7 +451,7 @@
this.getChang();
},
reloadUserinfo() {
this.u = uni.getStorageSync('mall_UserInfo');
this.u = uni.getStorageSync("mall_UserInfo");
},
//关闭登录窗口
gbAuth() {
......@@ -364,20 +463,21 @@
//点击分享
openShare(item) {
if (this.u) {
this.request2({
url: '/api/Share/SetShareCount',
this.request2(
{
url: "/api/Share/SetShareCount",
data: {
Id:item.Id
}
Id: item.Id,
},
},
res => {
(res) => {
if (res.resultCode == 1) {
item.ShareCount++;
}
}
);
this.goodTitle=item.MaterialInfo;
this.images=item.ImgList;
this.goodTitle = item.MaterialInfo;
this.images = item.ImgList;
this.sendQuanHandler();
this.showShare = true;
} else {
......@@ -395,18 +495,18 @@
}
},
//跳转
goUrl(item){
goUrl(item) {
if (item.LinkUrl && item.LinkUrl.length > 0) {
uni.navigateTo({
url: item.LinkUrl
})
url: item.LinkUrl,
});
}
},
//分享复制
sendQuanHandler() {
this.copyHandler();
//判断有图片再调用复制图片
if(this.images.length>0){
if (this.images.length > 0) {
setTimeout(() => {
this.savePicHandler();
}, 1000);
......@@ -433,7 +533,7 @@
if (res.statusCode === 200) {
uni.saveImageToPhotosAlbum({
filePath: res.tempFilePath,
success: function() {
success: function () {
arr.splice(0, 1);
if (arr.length > 0) {
that.downLoadImage(arr);
......@@ -442,10 +542,10 @@
uni.showToast({
title: "下载成功",
});
that.showDialog=true;
that.showDialog = true;
}
},
fail: function(e) {
fail: function (e) {
uni.hideLoading();
that.$refs.uTips.show({
title: "下载失败，请稍后重试",
......@@ -465,6 +565,6 @@
},
});
},
}
};
},
};
</script>
plugin/api.js
View file @ b44f1601
......@@ -3,7 +3,7 @@ export default {
Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285"
// Vue.prototype.host2 = "http://192.168.0.110:8200"
// Vue.prototype.host2 = "https://mallApi.oytour.com"
Vue.prototype.host2 = "http://192.168.2.16:8088"
Vue.prototype.host2 = "https://mallApi.oytour.com"
// Vue.prototype.host2 = "http://192.168.2.65"
Vue.prototype.request = function(param, success, failed) {
//网络请求
......@@ -49,16 +49,16 @@ export default {
},
success: res => {
if(res.data.resultCode == 10000){
if (res.data.resultCode == 10000) {
let u = uni.getStorageSync("mall_UserInfo");
if(u){
if (u) {
this.getLogin_t(u)
typeof failed == "function" && failed(res.data);
}
}else if(res.data.resultCode != 1) {
if( res.data.message!=''){
} else if (res.data.resultCode != 1) {
if (res.data.message != '') {
uni.showToast({
title: res.data.message,
icon: "none",
......@@ -69,8 +69,7 @@ export default {
typeof failed == "function" && failed(res.data);
}
else{
} else {
typeof success == "function" && success(res.data);
}
......@@ -86,10 +85,9 @@ export default {
}
// token失效再次登录接口
Vue.prototype.getLogin_t = function(obj) {
let pid = uni.getStorageSync("pid")?uni.getStorageSync("pid").pid:0;
let SmallShopId = uni.getStorageSync("SmallShopId")?uni.getStorageSync("SmallShopId").SmallShopId:0;
this.request2(
{
let pid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0;
let SmallShopId = uni.getStorageSync("SmallShopId") ? uni.getStorageSync("SmallShopId").SmallShopId : 0;
this.request2({
url: '/api/AppletLogin/Login',
data: {
Source: 1,
......@@ -98,7 +96,7 @@ export default {
Photo: obj.Photo,
Moblie: '',
SuperiorId: pid,
SmallShopId:SmallShopId,
SmallShopId: SmallShopId,
}
},
res => {
......@@ -122,7 +120,7 @@ export default {
OpenId: '',
UserId: 0,
token: '',
SmallShopsId:0,
SmallShopsId: 0,
}
if (mall_userinfo) {
if (mall_userinfo.OpenId) {
......
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