Skip to content

L
lumastoreapp
Commit fa4681d0 authored by home's avatar home
Browse files
Options

zxf

parents 7af45ea8 2fe885fc
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1000 additions and 667 deletions
manifest.json
View file @ fa4681d0
......@@ -3,8 +3,8 @@
//"appid" : "__UNI__FC9419E",
"appid" : "__UNI__1EA80F1", //这个是 web 的
"description" : "商家",
"versionName" : "1.0.99",
"versionCode" : 199,
"versionName" : "1.1.00",
"versionCode" : 110,
"transformPx" : false,
"compatible" : {
"ignoreVersion" : true, //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
......@@ -126,9 +126,9 @@
},
"splashscreen" : {
"android" : {
"hdpi" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"xhdpi" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
"xxhdpi" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png"
"hdpi" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"xhdpi" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
"xxhdpi" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png"
},
"ios" : {
"iphone" : {
......
pages/addEditEleProduct/addEditEleProduct.vue
View file @ fa4681d0
......@@ -341,6 +341,7 @@
},
data() {
return {
linkage_id:'',
is_datashow:true,
bools:'',
......@@ -430,6 +431,12 @@
],
isShow:false,
chindformList:[],
myProps:{
label:'cate_name',
value: 'cate_id',
children: '',
},
//上传图片相关的
c_pics: [],
c_pics1:[],
......@@ -731,7 +738,6 @@
},
confirm(e){
console.log(this.chindformList);return;
this.cate_name = e.item.cate_name;
this.form.cate_id =e.item.cate_id;
this.index = e.index;
......@@ -769,6 +775,7 @@
},
//修改的时候赋初始值
async eleProductInfofun(){
let that=this;
let res = await eleProductInfo({
product_id:this.product_id,
});
......@@ -808,24 +815,32 @@
this.form.commission = res.data.commission, //返佣比例
this.form.sell_type = res.data.sell_type, // 售卖类型
this.form.mandatory = res.data.mandatory
if(typeof res.data.video_photos == 'object'){
this.video_photos=res.data.video_photos;//轮播
this.detail_photos=res.data.detail_photos;//详情
res.data.video_photos.map(item=>{ //轮播
for(let i in res.data.video_photos){
this.c_pics1.push({
code:0,
data:item,
data:res.data.video_photos[i],
msg:"success",
time:"1587101904"
})
})
res.data.detail_photos.map(item=>{ //详情
});
}
}
if(typeof res.data.detail_photos == 'object'){
this.detail_photos=res.data.detail_photos;//详情
for(let i in res.data.detail_photos){
this.c_pics2.push({
code:0,
data:item,
data:res.data.detail_photos[i],
msg:"success",
time:"1587101904"
})
})
});
}
}
//下拉分类 初始值
this.chindformList.forEach((item,index)=>{
if(item.cate_id==res.data.cate_id){
......@@ -834,6 +849,8 @@
}
});
if(res.data.commodity_type == 'ordinary') {
this.ordinary.map(item=>{
if(this.linkage_product_id == item.product_id){
......
pages/eleProduct/eleProduct.vue
View file @ fa4681d0
......@@ -230,9 +230,11 @@
this.goods_list = [];
this.page = 1;
this.isallshow=false;
this.tabactive = 1,
// this.goods_product_list();
this.searchProduct();
},
computed: {
staticUrl () {//静态资源地址
return this.$store.state.staticUrl;
......
pages/index/index.vue
View file @ fa4681d0
......@@ -368,15 +368,6 @@
}
},
onLoad() {
getskipShop({
type: 'bld'
}).then(res => {
if (res.code == 0) {
this.is_bld = res.data.is_bld
// this.is_bld = 1
}
})
//显示欢迎回来~
setTimeout(() => {
this.$refs.Welcome.show();
......@@ -410,6 +401,16 @@
// uni.stopPullDownRefresh();//结束下拉刷新
},
onShow() {
getskipShop({
type: 'bld'
}).then(res => {
if (res.code == 0) {
this.is_bld = res.data.is_bld
// this.is_bld = 1
}
})
this.storeIndexfun();
......@@ -439,7 +440,15 @@
activity_nucleus(param).then(res => {
if (res.code == 0) {
this.$api.msg(res.msg);
uni.showModal({
title:'提示',
content:res.msg,
showCancel:false,
confirmText:'确定',
success() {
}
})
}else{
this.$api.msg(res.msg);
}
......
pages/order/order.vue
View file @ fa4681d0
......@@ -333,6 +333,6 @@
}
.orderlist{
padding: 100upx 24upx 0 24upx;box-sizing: border-box;
padding: 40upx 24upx 0 24upx;box-sizing: border-box;
}
</style>
pages/order/shoporderdetail/shoporderdetail.vue
View file @ fa4681d0
......@@ -36,10 +36,10 @@
</view>
<view class="bt_min flex1">{{detail.shop_name}}</view>
</view>
<view class="flex mt-30" v-for='(item,index) in detail.products' :key='index' >
<view class="flex mt-30" v-for='(item,index) in detail.products' :key='index'>
<view class="tuimg br_10 ov">
<image class="imgs" :src="staticUrl+item.photo" v-if="item.photo"></image>
<image class="imgs" :src="staticUrl+detail.photo" v-else ></image>
<image class="imgs" :src="staticUrl+detail.photo" v-else></image>
</view>
<view class="flex1 ml-25 goodsboxs">
<view class="sz_30 bt_hei twoline names" style="height:65upx">{{item.goods_name}}</view>
......@@ -78,6 +78,7 @@
<view class="name">订单编号</view>
<view class="vlas">{{logs.order_sn}}</view>
</view>
<view class="cellitems flex ali-c jus-b">
<view class="name">创建时间</view>
<view class="vlas">{{logs.createtime}}</view>
......@@ -87,10 +88,14 @@
<view class="vlas">{{detail.refund_details}}</view>
</view>
<view class="cellitems flex ali-c jus-b" >
<view class="name" style="width: 30%;">订单备注:</view>
<view class="vlas" style="text-align: left;">{{detail.message==''?'无':detail.message}}</view>
</view>
</view>
<!-- 订单信息 -->
<!-- 联系客服 -->
<view class="ordertelbox flex ">
<view class="itemboxss flex1 flex flexc" @tap="xlsj" :data-tel='detail.addr.mobile'>
......@@ -111,17 +116,23 @@
</template>
<script>
import { orderDetails } from "@/utils/api/api.js";
import {
orderDetails
} from "@/utils/api/api.js";
export default {
data(){
data() {
return {
order_id:"",
detail:{addr:{mobile:""}},
logs:{},
order_id: "",
detail: {
addr: {
mobile: ""
}
},
logs: {},
}
},
computed: {
staticUrl () {//静态资源地址
staticUrl() { //静态资源地址
return this.$store.state.staticUrl;
}
},
......@@ -129,14 +140,14 @@
this.order_id = options.order_id;
this.initializedata();
},
methods:{
xlsj(){//联系客户
methods: {
xlsj() { //联系客户
uni.makePhoneCall({
phoneNumber: this.detail.addr.mobile //仅为示例
});
},
//联系平台
lxpt(){
lxpt() {
uni.makePhoneCall({
phoneNumber: '15907083784' //仅为示例
});
......@@ -148,10 +159,10 @@
};
orderDetails(params).then(res => {
console.log(res);
if(res.code<0){
if (res.code < 0) {
// app.showToast({title: res.msg});
this.$api.msg(res.msg);
}else{
} else {
// that.setData({
// detail: res.data.detail,
// logs:res.data.logs,
......@@ -164,7 +175,7 @@
}
})
},
callTel: function (e) {
callTel: function(e) {
uni.makePhoneCall({
phoneNumber: e.currentTarget.dataset.tel // 仅为示例，并非真实的电话号码
})
......@@ -178,26 +189,32 @@
<style lang="scss">
/* pages/shop//order/weidianorder/weidianLine_item/weidianLine_item.wxss */
.ml-20{
.ml-20 {
margin-left: 20upx;
}
.mt-20{
.mt-20 {
margin-top: 20upx;
}
.mr-20{
.mr-20 {
margin-right: 20upx;
}
.mt-30{
.mt-30 {
margin-top: 30upx;
}
.ml-25{
.ml-25 {
margin-left: 25upx;
}
.sz_30{
.sz_30 {
font-size: 30upx;
}
.beijingimg {
background: linear-gradient(#FF5A03,#FF4216);
background: linear-gradient(#FF5A03, #FF4216);
width: 100%;
height: 300upx;
position: absolute;
......@@ -205,140 +222,164 @@
z-index: 1;
padding-left: 20upx;
padding-top: 25px;
.onetitle{
color:#FFFFFF;
.onetitle {
color: #FFFFFF;
font-size: 30upx;
}
.twotitle{
color:#FFFFFF;
.twotitle {
color: #FFFFFF;
font-size: 28upx;
}
}
.addresone{
.addresone {
margin-top: 20px;
}
.boxs {
position: relative;
z-index:2;
z-index: 2;
width: 100%;
padding: 24upx;
box-sizing: border-box;
}
.bt_min{
.bt_min {
font-size: 30upx;
}
.addrnamesv{
.addrnamesv {
font-size: 30upx;
}
.topbox_20 {
width: 100%;
background: rgba(255,255,255,1);
background: rgba(255, 255, 255, 1);
border-radius: 14rpx;
padding: 20upx;
box-sizing: border-box;
font-size: 30upx;
}
.skunames{
.skunames {
font-size: 24upx;
}
page{
page {
position: relative;
padding-bottom: 100upx;
background: #F5F5F5;
}
.weizhiimg{
.weizhiimg {
width: 30upx;
height: 46upx;
.imgs{
.imgs {
width: 30upx;
height: 46upx;
}
}
.shuwuimg{
width:67upx;
height:67upx;
border-radius:4upx;
.shuwuimg {
width: 67upx;
height: 67upx;
border-radius: 4upx;
overflow: hidden;
}
.btbox{
width:190upx;
height:77upx;
background:rgba(255,255,255,1);
border-radius:4upx;
.btbox {
width: 190upx;
height: 77upx;
background: rgba(255, 255, 255, 1);
border-radius: 4upx;
}
.xiangyouimg{
width:14upx;
height:24upx;
.xiangyouimg {
width: 14upx;
height: 24upx;
}
.dianhuimg{
width:42upx;
height:42upx;
.dianhuimg {
width: 42upx;
height: 42upx;
}
.kuai{
width:40upx;
height:40upx;
.kuai {
width: 40upx;
height: 40upx;
text-align: center;
line-height: 40upx;
font-size:24upx;
font-weight:500;
color:rgba(255,255,255,1);
font-size: 24upx;
font-weight: 500;
color: rgba(255, 255, 255, 1);
}
.dibu_qr{
.dibu_qr {
position: fixed;
bottom: 0;
width:100%;
background:rgba(255,255,255,1);
width: 100%;
background: rgba(255, 255, 255, 1);
padding: 10upx 24upx;
box-sizing: border-box;
}
.beizhu{
.beizhu {
width: 150upx;
text-align: right;
}
.tubiimg{
width:27upx;
height:24upx;
.imgs{
width:27upx;
height:24upx;
.tubiimg {
width: 27upx;
height: 24upx;
.imgs {
width: 27upx;
height: 24upx;
}
}
.tuimg{
width:183upx;
height:183upx;
.imgs{
width:183upx;
height:183upx;
.tuimg {
width: 183upx;
height: 183upx;
.imgs {
width: 183upx;
height: 183upx;
}
}
view{
view {
line-height: 112%;
letter-spacing:3upx
letter-spacing: 3upx
}
.dianhuimg{
width:43upx;
height:43upx;
.dianhuimg {
width: 43upx;
height: 43upx;
}
.shuxian{
width:1px;
height:100upx;
background:rgba(242,242,242,1);
.shuxian {
width: 1px;
height: 100upx;
background: rgba(242, 242, 242, 1);
}
.duanxian{
width:45upx;
height:1px;
background: rgba(181,181,181,1);
.duanxian {
width: 45upx;
height: 1px;
background: rgba(181, 181, 181, 1);
}
.cptjimg{
width:100%;
height:310upx;
.cptjimg {
width: 100%;
height: 310upx;
}
/* 取消弹窗 */
.zan-dialog__mask {
position: fixed;
......@@ -373,91 +414,106 @@
display: block;
}
.goodsboxs{
.goodsboxs {
font-size: 30upx;
.names{
.names {
font-size: 30upx;
}
.prices{
.prices {
font-size: 30upx;
}
.sumns{
color:rgb(192, 190, 190);
.sumns {
color: rgb(192, 190, 190);
}
}
//联系kefu 客服
.ordertelbox{
.ordertelbox {
margin: 0 24upx;
margin-top: 20upx;
height:89upx;
background:rgba(255,255,255,1);
border-radius:0px 0px 14upx 14upx;
.itemboxss{
height: 89upx;
background: rgba(255, 255, 255, 1);
border-radius: 0px 0px 14upx 14upx;
.itemboxss {
position: relative;
height: 89upx;
line-height: 89upx;
.img{
width:43upx;
height:43upx;
.img {
width: 43upx;
height: 43upx;
margin-right: 20upx;
}
.name{
font-size:30upx;
color:rgba(0,0,0,1);
.name {
font-size: 30upx;
color: rgba(0, 0, 0, 1);
}
}
.itemboxss:nth-child(1):after{
.itemboxss:nth-child(1):after {
content: "";
width:1px;
height:89px;
background:rgba(242,242,242,1);
width: 1px;
height: 89px;
background: rgba(242, 242, 242, 1);
position: absolute;
top:0;
top: 0;
right: 0;
}
}
//客服end
//价格明细列表
.cellboxs{
.cellboxs {
margin: 20upx 0;
margin-top: 20upx;
.cellitems{
.cellitems {
padding: 0 20upx;
height: 88upx;
line-height: 88upx;
border-bottom: 1px solid #F5F1F1;
background: #FFFFFF;
.name{
font-size:30upx;
color:rgba(0,0,0,1);
.name {
font-size: 30upx;
color: rgba(0, 0, 0, 1);
}
.vlas{
font-size:30upx;
color:rgba(0,0,0,1);
.vlas {
font-size: 30upx;
color: rgba(0, 0, 0, 1);
}
}
.cellitems:nth-last-child(1){
border:0;
.cellitems:nth-last-child(1) {
border: 0;
}
.subsbox{
.name{
font-size:30upx;
font-family:PingFang SC;
font-weight:bold;
color:rgba(0,0,0,1);
.subsbox {
.name {
font-size: 30upx;
font-family: PingFang SC;
font-weight: bold;
color: rgba(0, 0, 0, 1);
}
.vlas{
color:#FF6900;
.fuhao{
.vlas {
color: #FF6900;
.fuhao {
font-size: 30upx;
}
.shuzi{
font-family:PingFang SC;
font-weight:bold;
.shuzi {
font-family: PingFang SC;
font-weight: bold;
font-size: 36upx;
}
}
......
pages/publishActivities/activityList/activityList.vue
View file @ fa4681d0
......@@ -15,7 +15,7 @@
<view class="projuctlist" :hidden="!(tabactive==1)">
<view class="" v-if="start_activity.length>0">
<checkbox-group >
<checkbox-group>
<!-- 单个商品 -->
<view class="itempro flex " v-for="(item,index) in start_activity" :key="index" @click="jumpDetail(item.activity_id)">
<!-- <label class="ali-c">
......@@ -23,22 +23,25 @@
</label> -->
<image class="thumbnail" :src="staticUrl + item.picture" mode=""></image>
<view class="infobox" style="width: 70%;">
<view class="title oneline" style="height:45upx ;">{{item.goods_name}}</view>
<!-- <view class="time">上架时间：{{item.create_time}}</view> -->
<view>
<view style="font-size:26rpx;font-weight:bold;">领取时间：</view>
<view style="font-size:24rpx;color:#656565">{{item.start}}—{{item.end}}</view>
</view>
</view>
<view class="btnbox flex" >
<view class="btnbox flex">
<!-- <view class="btns btnboxdel" @tap="deleteEleProductfun(item,index)">删 除</view> -->
<!-- <view class="btns btnboxxj" @tap="Selectiondata(item)" v-if="tabactive==1 && isselect==1">加入活动</view> -->
<!-- <view class="btns btnboxxj" @tap="sold_outfun(item.id,1,index)" v-else-if="tabactive==1">下 架</view> -->
<!-- <view class="btns btnboxxj" @tap="sold_outfun(item.id,0,index)" v-show="tabactive==2">上 架</view> -->
<!-- <view class="btns btnboxxj" @click="setSpecs(item.product_id)" >规格</view> -->
<view >
<view>
<view class="btnboxdel flex" style="align-items: center;" @click.stop="switch1Change">
活动开关：<switch :data-activity_id="item.activity_id" :checked="item.state==1" @change="switch1Change" />
活动开关：
<switch :data-activity_id="item.activity_id" :checked="item.state==1" @change="switch1Change" />
<view class="btns btnboxdel" @tap.stop="tochanges(item,index)">修 改</view>
</view>
</view>
......@@ -49,14 +52,14 @@
</view>
<view v-if="start_activity.length <= 0" style="text-align: center;width: 100%;height:1000upx;line-height: 1000upx;font-size: 50upx;color:#8C8C8C ;">
还没有人领取~~
<image src="https://luma.jxdsy.cn//static/applet5/images/uts/meiyoule.png" mode=""></image>
</view>
</view>
<view class="projuctlist" :hidden="!(tabactive==2)">
<view class="" v-if="end_activity.length > 0">
<checkbox-group >
<checkbox-group>
<!-- 单个商品 -->
<view class="itempro flex " v-for="(item,index) in end_activity" :key="index" @click="jumpDetail(item.activity_id)">
<!-- <label class="ali-c">
......@@ -86,7 +89,7 @@
</checkbox-group>
</view>
<view v-if="end_activity.length <= 0" style="text-align: center;width: 100%;height:1000upx;line-height: 1000upx;font-size: 50upx;color:#8C8C8C ;">
还没有人领取~~
<image src="https://luma.jxdsy.cn//static/applet5/images/uts/meiyoule.png" mode=""></image>
</view>
</view>
......@@ -109,8 +112,8 @@
page: 0,
start_activity: [],
end_activity: [],
endpages:0,
startpages:0
endpages: 0,
startpages: 0
}
},
......@@ -130,8 +133,8 @@
})
},
//下拉刷新
onPullDownRefresh(){
if(this.tabactive == 1){
onPullDownRefresh() {
if (this.tabactive == 1) {
this.startpages = 0
activity_select({
shop_id: this.shop_id,
......@@ -144,7 +147,7 @@
}
})
}else if(this.tabactive == 2){
} else if (this.tabactive == 2) {
this.endpages = 0
activity_select({
shop_id: this.shop_id,
......@@ -161,7 +164,7 @@
},
//上拉触底
onReachBottom(){
onReachBottom() {
if (this.tabactive == 1) {
activity_select({
shop_id: this.shop_id,
......@@ -169,7 +172,7 @@
is_date: 2
}).then(res => {
if (res.code == 0) {
this.start_activity = [...this.start_activity,...res.data.data]
this.start_activity = [...this.start_activity, ...res.data.data]
}
})
......@@ -180,7 +183,7 @@
is_date: 1
}).then(res => {
if (res.code == 0) {
this.end_activity = [...this.this.end_activity,...res.data.data]
this.end_activity = [...this.end_activity, ...res.data.data]
}
})
}
......@@ -215,9 +218,9 @@
methods: {
jumpDetail(activity_id){
jumpDetail(activity_id) {
uni.navigateTo({
url:`/pages/publishActivities/activityDetail/activityDetail?activity_id=${activity_id}`
url: `/pages/publishActivities/activityDetail/activityDetail?activity_id=${activity_id}`
})
},
//修改活动
......@@ -229,12 +232,12 @@
},
// 查找产品
findEleProduct(){
findEleProduct() {
},
switch1Change(e) {
if(e.type=='change'){
if (e.type == 'change') {
console.log(e)
if (e.detail.value) {
activity_close({
......@@ -258,8 +261,8 @@
}
})
}
}else{
return ;
} else {
return;
}
},
......
pages/storeqrcode/storeqrcode.vue
View file @ fa4681d0
......@@ -164,6 +164,7 @@
const d = await getSharePoster({
// backgroundImage:"/static/news/sjrwm.png",
backgroundImage:this.statictowUrl+"static/applet5/images/uts/sjrwm.png",
//暂时使用这个
......@@ -239,16 +240,23 @@
// Context.setFillStyle('black');
// Context.setGlobalAlpha(0.3);
// Context.fillRect(0, bgObj.height - bgObj.height*0.2, bgObj.width, bgObj.height*0.2);
}
},
});
console.log('海报生成成功， 临时路径: ' + d.poster.tempFilePath)
this.poster.finalPath = d.poster.tempFilePath;
console.log(this.poster.finalPath)
}
this.qrShow = true;
} catch (e) {
_app.hideLoading();
_app.showToast(JSON.stringify(e));
console.log(JSON.stringify(e));
console.log('海报生成成功， 临时路径: ' + d.poster.tempFilePath)
}
},
saveImage() {
......@@ -280,6 +288,8 @@
}
</script>
<style lang="scss">
.hideCanvasView {
position: relative;
......
utils/api/merchant.js
View file @ fa4681d0
......@@ -38,12 +38,12 @@ export function getActivityList(data){
//判断商家类型 商品入库
export function getskipShop(data){
return request.post("/user/skipShop", data, { noAuth: true});
return request.post("user/skipShop", data, { noAuth: true});
}
//获取分类 列表
export function getshopclass(data){
return request.post("/ele/weigh", data, { noAuth: true});
return request.post("ele/weigh", data, { noAuth: true});
}
......@@ -52,7 +52,7 @@ export function getshopclass(data){
*/
//获取分类 列表
export function activity_nucleus(data){
return request.post("/ele/activity_nucleus", data, { noAuth: true});
return request.post("ele/activity_nucleus", data, { noAuth: true});
}
/**
......@@ -60,7 +60,7 @@ export function activity_nucleus(data){
* @param {Object} data
*/
export function activity_add(data){
return request.post("/ele/activity_add", data, { noAuth: true});
return request.post("ele/activity_add", data, { noAuth: true});
}
/**
......@@ -68,7 +68,7 @@ export function activity_add(data){
* @param {Object} data
*/
export function activity_select(data){
return request.post("/ele/activity_select", data, { noAuth: true});
return request.post("ele/activity_select", data, { noAuth: true});
}
/**
......@@ -76,7 +76,7 @@ export function activity_select(data){
* @param {Object} data
*/
export function activity_close(data){
return request.post("/ele/activity_close", data, { noAuth: true});
return request.post("ele/activity_close", data, { noAuth: true});
}
/**
......@@ -84,7 +84,7 @@ export function activity_close(data){
* @param {} data
*/
export function activity_find(data){
return request.post("/ele/activity_find", data, { noAuth: true});
return request.post("ele/activity_find", data, { noAuth: true});
}
......@@ -93,7 +93,7 @@ export function activity_find(data){
* @param {} data
*/
export function activity_user(data){
return request.post("/ele/activity_user", data, { noAuth: true});
return request.post("ele/activity_user", data, { noAuth: true});
}
......@@ -102,5 +102,5 @@ export function activity_user(data){
* @param {} data
*/
export function activity_update(data){
return request.post("/ele/activity_update", data, { noAuth: true});
return request.post("ele/activity_update", data, { noAuth: true});
}
\ No newline at end of file
utils/debug.js
View file @ fa4681d0
......@@ -10,12 +10,8 @@ module.exports = {
// xqdebug:false,//正式权限
xqdebug:true,//发布审核权限 也是测试环境的 主要用于ios
// #ifdef APP-PLUS
// isdebug:false,//正式 APP里面绝对是正式
// #endif
/**
* PS
*
* 正式环境 选 false !
* 本地开发环境 选 true
*
* */
}
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