Skip to content

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

zxf

parent a7480613
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 457 additions and 187 deletions
components/plan-image-upload/up_img.vue
View file @ a1a30795
......@@ -228,7 +228,7 @@
console.info(this.value,imageIndex);
let arr = this.value.map((item,index)=>{
return this.staticUrl1 +item.data;
return this.staticUrl1 + item.data;
})
uni.previewImage({
......
manifest.json
View file @ a1a30795
......@@ -3,13 +3,13 @@
//"appid" : "__UNI__FC9419E",
"appid" : "__UNI__1EA80F1", //这个是 web 的
"description" : "商家",
"versionName" : "1.0.88",
"versionCode" : 188,
"versionName" : "1.0.89",
"versionCode" : 189,
"transformPx" : false,
/* 5+App特有相关 */
/* 5+App特有相关weex */
"app-plus" : {
"usingComponents" : true,
"nvueCompiler" : "weex",
"nvueCompiler" : "uni-app",
"splashscreen" : {
"alwaysShowBeforeRender" : false,
"waiting" : false,
......@@ -115,9 +115,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/DefaultLaunch640_1136.png",
"xhdpi" : "C:/Users/Administrator/Desktop/da/DefaultLaunch750_1334.png",
"xxhdpi" : "C:/Users/Administrator/Desktop/da/DefaultLaunch1125_2436.png"
},
"ios" : {
"iphone" : {
......
pages/eleProduct/eleProduct.scss
View file @ a1a30795
......@@ -147,4 +147,12 @@
text-align: center;
width: 100%;
border-radius: 14upx;
}
\ No newline at end of file
}
.submitbtns2{
height: 44px;
line-height: 44px;
border-bottom: 1px solid #eee;
text-align: center;
width: 100%;
}
\ No newline at end of file
pages/eleProduct/eleProduct.vue
View file @ a1a30795
<template>
<!-- 产品管理 -->
<!-- 产品 -->
<view class="ProductManage pb-100 yocode">
<!-- tab切换 -->
<view class="projuctTab flex">
<view class="tabitems flex1" :class="{active:tabactive==1}" @tap="taggletab(1)">
<view class="tabtitle">出售中</view>
<!-- （{{count[0]}}） -->
</view>
<view class="tabitems flex1" :class="{active:tabactive==2}" @tap="taggletab(2)">
<view class="tabtitle">已下架</view>
<!-- （{{count[1]}}） -->
</view>
<view class="ProductManage pb-100 yocode">
<view class="projuctTab flex" style="background-color: #EEEEEE;justify-content: center;align-items:center ;">
<view class="" style="width: 65%;">
<input type="searchInput" value="" placeholder="搜索" style=" " />
</view>
<view class="" style="width: 90upx;height: 90upx;" >
<image src="../../static/icon/1.png" mode="" style="display: inline;"></image>
</view>
</view>
<!-- tab切换 -->
<view class="projuctTab flex" style="top: 184upx;">
<view class="tabitems flex1" :class="{active:tabactive==1}" @tap="taggletab(1)">
<view class="tabtitle">出售中</view>
<!-- （{{count[0]}}） -->
</view>
<view class="tabitems flex1" :class="{active:tabactive==2}" @tap="taggletab(2)">
<view class="tabtitle">已下架</view>
<!-- （{{count[1]}}） -->
</view>
</view>
<view class="projuctlist" v-if="goods_list.length!=0">
......@@ -24,7 +33,7 @@
<checkbox :value="item.id.toString()" :checked="item.checked==true" />
</label> -->
<image class="thumbnail" :src="staticUrl + item.photo" mode=""></image>
<view class="infobox">
<view class="infobox" style="width: 60%;">
<view class="title oneline">{{item.product_name}}</view>
<!-- <view class="time">上架时间：{{item.create_time}}</view> -->
<view class="price">¥{{item.price}}元</view>
......@@ -63,12 +72,20 @@
<view class="btns btns2" v-show="tabactive==1" @tap="sold_outfun('all',1)">下架</view>
<view class="btns btns2" v-show="tabactive==2" @tap="sold_outfun('all',0)">上架</view>
</view> -->
<!-- <view @click="open" class="submitbtns">添加</view> -->
<navigator :url="'/pages/addEditEleProduct/addEditEleProduct?activity_type='+activity_type+'&isadd=0' " class="submitbtns">添加</navigator>
</view>
<pageScrollTo v-if="isshowtop" ></pageScrollTo>
<!-- <uniPopup ref="popup" type="bottom" >
<view class="" style="background-color: #fff;">
<button @click="addeleproduct" type="default">添加外卖</button>
<navigator :url="'/pages/addEditEleProduct/addEditEleProduct?activity_type='+activity_type+'&isadd=0' " class="submitbtns2">添加外卖</navigator>
<navigator :url="'/pages/addEditEleProduct/addEditEleProduct?activity_type='+activity_type+'&isadd=0' " class="submitbtns2">商品入库</navigator>
<button type="default">商品入库</button>
<view @click="close" type="default" class="submitbtns2">取消</view>
</view>
</uniPopup> -->
</view>
</template>
......@@ -76,12 +93,13 @@
// import { goods_product_list, sold_out,sold_outAll} from "@/utils/api/store.js";
import pageScrollTo from "@/components/pageScrollTo/pageScrollTo.vue"
import empty from "@/components/empty/empty.vue"
import uniPopup from '@/components/uni-popup/uni-popup.vue'
import {eleProductList,autoManageProduct,deleteEleProduct} from "@/utils/api/api.js";
export default {
components:{
pageScrollTo,
empty,
empty,
uniPopup
},
data() {
return {
......@@ -112,7 +130,8 @@
},
onShow() {
onShow() {
// console.log(this.$refs.popup)
this.goods_list = [];
this.page = 0;
this.isallshow=false;
......@@ -139,7 +158,23 @@
}
},
methods:{
methods:{
addeleproduct(){
console.log('外卖')
// :url="'/pages/addEditEleProduct/addEditEleProduct?activity_type='+activity_type+'&isadd=0' "
uni.navigateTo({
url:"'/pages/addEditEleProduct/addEditEleProduct?activity_type="+this.activity_type+'&isadd=0'
})
},
close(){
this.$refs.popup.close()
},
open(){
this.$refs.popup.open()
},
//修改外卖产品
tochanges(data,index){
uni.navigateTo({
......@@ -294,5 +329,5 @@
</script>
<style lang="scss">
@import "./eleProduct.scss"
@import "./eleProduct.scss";
</style>
pages/index/index.vue
View file @ a1a30795
......@@ -6,28 +6,30 @@
<view class="tit">店铺名称:{{ storeinfo.shop_name }}</view>
<!-- {{shop.shop_name}} -->
<view :class="['jiu', shop_type == 'ele'?'':'jus-b']">
<view class="jiu_01" v-if="shop_type == 'ele'">
<view class="jiu_01" v-if="is_bld == 1">
<view @tap="saoma">
<image class="img" src="/static/icon/1.png" mode=""></image>
<image class="img" src="/static/icon/1.png" mode="" ></image>
<view>扫码入库</view>
</view>
</view>
<view class="jiu_01">
</view>
<view class="jiu_01" :style="is_bld==1?'':'width: 33%;'">
<navigator url="/pages/notice/notice">
<view><image class="img" src="/static/icon/newsicon.png" mode=""></image></view>
<view><image class="img" src="/static/icon/newsicon.png" mode="" ></image></view>
<view>消息通知</view>
</navigator>
</view>
<view class="jiu_01">
<view class="jiu_01" :style="is_bld==1?'':'width: 33%;'">
<navigator url="/pages/user/tongji/tongji">
<view><image class="img" src="/static/icon/zijinicons.png" mode=""></image></view>
<view><image class="img" src="/static/icon/zijinicons.png" mode="" ></image></view>
<view>商户资金</view>
</navigator>
</view>
<view class="jiu_01 ">
<view class="jiu_01" :style="is_bld==1?'':'width: 33%;'">
<navigator url="/pages/user/mingxi/mingxi">
<view><image class="img" src="/static/icon/3.png" mode=""></image></view>
<view><image class="img" src="/static/icon/3.png" mode="" ></image></view>
<view>佣金明细</view>
</navigator>
</view>
......@@ -79,7 +81,7 @@
</view>
<view class="jiu_max " v-if="shop_type == 'ele'">
<navigator :url="'/pages/eleProduct/eleProduct?activity_type='+ activity_type ">
<navigator :url="'/pages/eleProduct/eleProduct?edit=0&activity_type='+ activity_type ">
<view class="jiu_min">
<view><image class="img" src="/static/icon/20.png" mode=""></image></view>
<view>外卖产品</view>
......@@ -221,6 +223,25 @@
</view>
</navigator>
</view>
<view class="jiu_max " >
<navigator url="/pages/eleProduct/eleProduct?edit=1">
<view class="jiu_min">
<view><image class="img" src="/static/icon/psfei.png" mode=""></image></view>
<view>快捷改价</view>
</view>
</navigator>
</view>
<view class="jiu_max " >
<navigator url="/pages/eleProduct/eleProduct?edit=2">
<view class="jiu_min">
<view><image class="img" src="/static/icon/psfei.png" mode=""></image></view>
<view>增减库存</view>
</view>
</navigator>
</view>
</view>
<view class="BH"></view>
<Welcome ref="Welcome"></Welcome>
......@@ -228,7 +249,8 @@
</view>
</template>
<script>
<script>
import{getskipShop} from "@/utils/api/merchant.js";
import uniBadge from "@/components/uni/uni-badge/uni-badge.vue"
import uniIcon from "@/components/uni/uni-icon/uni-icon.vue"
import yomolUpgrade from '@/components/yomol-upgrade/yomol-upgrade.vue'; //升级组件
......@@ -244,7 +266,8 @@
shop_type: "", //店铺类型 ele goods
is_luck_draw:"",
money_type:"",
activity_type:0
activity_type:0,
is_bld:''
}
},
components: {
......@@ -258,7 +281,15 @@
return this.$store.state.userInfo;
}
},
onLoad() {
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();
......@@ -298,7 +329,12 @@
success: (results) => {
console.log(results);
if(results.data.code==0){
this.$api.msg(results.data.msg);
// this.$api.msg(results.data.msg);
results.isScanCode=false;
results.code=res.result;
uni.navigateTo({
url: '/pages/addEditEleProduct/addEditEleProduct?results='+JSON.stringify(results)
})
}else if(results.data.code==1){
results.isScanCode=false;
results.code=res.result;
......@@ -427,11 +463,13 @@
padding: 30upx 20upx 30upx;
box-sizing: border-box;
font-size: 24upx;
}
}
.jiu_max {
width: 33%;
}
}
.jiu_min {
width: 100%;
......
utils/api/merchant.js
View file @ a1a30795
......@@ -34,4 +34,14 @@ import request from "./../request.js";//这里用的是two
export function getActivityList(data){
return request.post("store/getActivityList", data, { noAuth: true});
}
\ No newline at end of file
}
//判断商家类型 商品入库
export function getskipShop(data){
return request.post("/user/skipShop", data, { noAuth: true});
}
//获取分类 列表
export function getshopclass(data){
return request.post("/ele/weigh", data, { noAuth: true});
}
utils/debug.js
View file @ a1a30795
......@@ -6,7 +6,7 @@ module.exports = {
isdebug:false,//正式
// isdebug:true,//测试
// isdebug: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