Skip to content

L
lumastoreapp
Commit f9a65ee2 authored by xieyishang's avatar xieyishang
Browse files
Options

ssss

parent ad6202fd
Expand all Show whitespace changes
Inline Side-by-side
Showing with 789 additions and 117 deletions
components/plan-image-upload/up_img.vue
View file @ f9a65ee2
......@@ -2,7 +2,8 @@
<view class="imageUploadContainer">
<view class="imageUploadList">
<view class="imageItem" v-bind:key="index" v-for="(path,index) in value">
<image :src="staticUrl1+path.data" :class="{'dragging':isDragging(index)}" draggable="true" @tap="previewImage" :data-index="index" @touchstart="start" @touchmove="move" @touchend="stop"></image>
<image :src="staticUrl1+path.data" :class="{'dragging':isDragging(index)}" draggable="true" @tap="previewImage" :data-index="index" ></image>
<!-- @touchstart="start" @touchmove="move" @touchend="stop" -->
<view v-if="isShowDel" class="imageDel" @tap="deleteImage" :data-index="index">x</view>
</view>
<view v-if="isShowAdd" class="imageUpload" @tap="selectImage">+</view>
......@@ -220,12 +221,20 @@
this.$emit('input', this.value)
},
previewImage: function(e){
var imageIndex = e.currentTarget.dataset.index
console.info("查看图片");
var imageIndex = e.currentTarget.dataset.index;
console.info(this.value,imageIndex);
let arr = this.value.map((item,index)=>{
return this.staticUrl1 +item.data;
})
uni.previewImage({
current: this.value[imageIndex],
current: imageIndex,//this.value[imageIndex],
indicator: "number",
loop: "true",
urls:this.value
urls:arr,//this.value
})
},
initImageBasePos: function(){
......@@ -253,6 +262,8 @@
isDragging: function(indx){
return this.dragIndex === indx
},
//拖动？
start: function(e){
if(!this.isDragable){
return
......@@ -274,6 +285,7 @@
this.moveLeft = e.target.offsetLeft
this.moveTop = e.target.offsetTop
},
//移动图片
move: function(e){
if(!this.isDragable){
return
......@@ -291,6 +303,7 @@
this.moveLeft = touch.clientX - this.deltaLeft
this.moveTop = touch.clientY - this.deltaTop
},
//移动
stop: function(e){
if(!this.isDragable){
return
......
components/yiCheckbox/yiCheckbox.vue 0 → 100644
View file @ f9a65ee2
<template>
<view class="yiCheckbox">
<view class="typesname">{{chinddata.name}}:</view>
<view class="yiCheckbox_body flex flex-wrap">
<!-- v-for="(value,index) in chinddata.spec_item" -->
<view class="chindboxitem" :class="{'cur': rSelect.indexOf(index)!=-1}" v-for="(value, key, index) in chinddata.spec_item" :key="index" @tap="tapInfo(index,key, index)">
<!-- {{value.name}} -->
{{ value }}
</view>
</view>
</view>
</template>
<script>
export default {
props:{
//数据
chinddata:{
type:Object,
default:()=>{
return {};
}
},
isindex:{
type:Number,
default:0,
}
},
data(){
return{
rSelect:[],//选中的列表
isdataarr:[],//选中的数据
infoArr:[
{name:"石霸天"},
{name:"石1天"}
],
}
},
methods:{
tapInfo(e,key, index) {
//console.info(e,key, index);
if (this.rSelect.indexOf(e) == -1) {
//console.log(e)//打印下标
this.rSelect.push(e);//选中添加到数组里
this.isdataarr.push({name:this.chinddata.spec_item[key],id:key});//选中的数据 真实的
} else {
this.rSelect.splice(this.rSelect.indexOf(e), 1); //取消
this.isdataarr.splice(this.rSelect.indexOf(e), 1);
}
//把选中的值传回去
this.$emit("changecheckbox",{index:this.isindex,child:this.isdataarr,specList_item_id:this.chinddata.id});
}
},
onLoad() {
},
}
</script>
<style lang="scss">
.yiCheckbox{
margin-top: 20upx;
}
.typesname{
color:#000000;
font-weight: bold;
margin-bottom: 10upx;
}
.chindboxitem{
padding:8upx 20upx;
margin-right: 15upx;
border-radius: 10upx;
color:#FFFFFF;
background-color: #c8c7cc;
margin-bottom: 10upx;
}
.cur {
color: white;
border: 1px solid #e5e5e5;
background-color: #ff5d00;
}
</style>
manifest.json
View file @ f9a65ee2
......@@ -2,8 +2,8 @@
"name" : "鹿马商家助手",
"appid" : "__UNI__1EA80F1",
"description" : "",
"versionName" : "1.0.12",
"versionCode" : 112,
"versionName" : "1.0.13",
"versionCode" : 113,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
......
pages.json
View file @ f9a65ee2
......@@ -251,7 +251,14 @@
"style" : {
"navigationBarTitleText":"隐私政策"
}
},
{
"path" : "pages/feedback/feedback",
"style" : {
"navigationBarTitleText":"意见反馈"
}
}
],
"globalStyle": {
"navigationBarTextStyle": "black",
......
pages/edit/Qualifications/Qualifications.vue
View file @ f9a65ee2
......@@ -9,7 +9,7 @@
<view class="biao_05">
请上传相关资质图片：
</view>
<robby-image-upload fileKeyName="img" :value="c_pics" :server-url="uploadurl1" :form-data="c_formData" :server-url-delete-image="uploadurl1"
<robby-image-upload fileKeyName="img" :value="c_pics" :server-url="uploadurl1+'/merchant.php/FileUpload/uploadify'" :form-data="c_formData" :server-url-delete-image="uploadurl1"
@delete="c_delImage" @add="c_onImg" @move="onMove_c" :limit="3"></robby-image-upload>
</view>
......
pages/edit/pro_manage/pro_manage.vue
View file @ f9a65ee2
......@@ -25,7 +25,7 @@
<view class="btn_01" @tap="pullfun(item,index)" v-if="current==0" >下架</view>
<view class="btn_01" @tap="pushfun(item,index)" v-if="current==1" >上架</view>
<view class="btn_01" @tap="delfun(item,index)" >删除</view>
<!-- <view class="btn_01" @click="setSpecs(item.id)" v-if="item.state==1">规格</view> -->
<view class="btn_01" @click="setSpecs(item.goods_id)" >规格</view>
</view>
</view>
</view>
......
pages/feedback/feedback.vue 0 → 100644
View file @ f9a65ee2
<template>
<view class="page">
<view class='feedback-title'>
<text>问题和意见</text>
<text class="feedback-quick" @tap="chooseMsg">快速键入</text>
</view>
<view class="feedback-body">
<textarea placeholder="请详细描述你的问题和意见..." v-model="sendDate.content" class="feedback-textare" />
</view>
<view class='feedback-title'>
<text>图片(选填,提供问题截图,总大小10M以下)</text>
</view>
<view class="feedback-body feedback-uploader">
<view class="uni-uploader">
<view class="uni-uploader-head">
<view class="uni-uploader-title">点击预览图片</view>
<view class="uni-uploader-info">{{imageList.length}}/8</view>
</view>
<view class="uni-uploader-body">
<view class="uni-uploader__files">
<block v-for="(image,index) in imageList" :key="index">
<view class="uni-uploader__file" style="position: relative;">
<image class="uni-uploader__img" :src="image" @tap="previewImage"></image>
<view class="close-view" @click="close(index)">x</view>
</view>
</block>
<view class="uni-uploader__input-box" v-show="imageList.length < 8">
<view class="uni-uploader__input" @tap="chooseImg"></view>
</view>
</view>
</view>
</view>
</view>
<view class='feedback-title'>
<text>QQ/邮箱</text>
</view>
<view class="feedback-body inputsboxss ali-c">
<input class="feedback-input" v-model="sendDate.contact" placeholder="(选填,方便我们联系你 )" />
</view>
<view class='feedback-title feedback-star-view'>
<text>应用评分</text>
<view class="feedback-star-view">
<text class="feedback-star" v-for="(value,key) in stars" :key="key" :class="key < sendDate.score ? 'active' : ''" @tap="chooseStar(value)"></text>
</view>
</view>
<button type="primary" class="feedback-submit" @tap="send">提交</button>
</view>
</template>
<script>
export default {
data() {
return {
msgContents: ["登录不上去", "订单问题", "资金问题", "偶发性崩溃"],
stars: [1, 2, 3, 4, 5],
imageList: [],
sendDate: {
score: 0,
content: "",
contact: ""
}
}
},
onLoad() {
let deviceInfo = {
appid: plus.runtime.appid,
imei: plus.device.imei, //设备标识
p: plus.os.name === "Android" ? "a" : "i", //平台类型，i表示iOS平台，a表示Android平台。
md: plus.device.model, //设备型号
app_version: plus.runtime.version,
plus_version: plus.runtime.innerVersion, //基座版本号
os: plus.os.version,
net: "" + plus.networkinfo.getCurrentType()
}
this.sendDate = Object.assign(deviceInfo, this.sendDate);
},
methods: {
close(e){
this.imageList.splice(e,1);
},
chooseMsg() { //快速输入
uni.showActionSheet({
itemList: this.msgContents,
success: (res) => {
this.sendDate.content = this.msgContents[res.tapIndex];
}
})
},
chooseImg() { //选择图片
uni.chooseImage({
sourceType: ["camera", "album"],
sizeType: "compressed",
count: 8 - this.imageList.length,
success: (res) => {
this.imageList = this.imageList.concat(res.tempFilePaths);
}
})
},
chooseStar(e) { //点击评星
this.sendDate.score = e;
},
previewImage() { //预览图片
uni.previewImage({
urls: this.imageList
});
},
send() { //发送反馈
console.log(JSON.stringify(this.sendDate));
let imgs = this.imageList.map((value, index) => {
return {
name: "image" + index,
uri: value
}
})
if(this.sendDate.content==""){
this.$api.msg("反馈的内容不能为空");
return false;
}
this.$api.msg("反馈成功~");//先做一个jia的 过shenhe
// uni.uploadFile({
// url: "https://service.dcloud.net.cn/feedback",
// files: imgs,
// formData: this.sendDate,
// success: (res) => {
// if (res.statusCode === 200) {
// uni.showToast({
// title: "反馈成功!"
// });
// this.imageList = [];
// this.sendDate = {
// score: 0,
// content: "",
// contact: ""
// }
// }
// },
// fail: (res) => {
// uni.showToast({
// title: "失败",
// icon:"none"
// });
// console.log(res)
// }
// });
}
}
}
</script>
<style>
@font-face {
font-family: uniicons;
font-weight: normal;
font-style: normal;
src: url('https://img-cdn-qiniu.dcloud.net.cn/fonts/uni.ttf') format('truetype');
}
page {
background-color: #EFEFF4;
}
view{
font-size: 28upx;
}
.input-view {
font-size: 28upx;
}
.close-view{
text-align: center;line-height:14px;height: 16px;width: 16px;border-radius: 50%;background: #FF5053;color: #FFFFFF;position: absolute;top: -6px;right: -4px;font-size: 12px;
}
/* 上传 */
.uni-uploader {
flex: 1;
flex-direction: column;
}
.uni-uploader-head {
display: flex;
flex-direction: row;
justify-content: space-between;
}
.uni-uploader-info {
color: #B2B2B2;
}
.uni-uploader-body {
margin-top: 16upx;
}
.uni-uploader__files {
display: flex;
flex-direction: row;
flex-wrap: wrap;
}
.uni-uploader__file {
margin: 10upx;
width: 210upx;
height: 210upx;
}
.uni-uploader__img {
display: block;
width: 210upx;
height: 210upx;
}
.uni-uploader__input-box {
position: relative;
margin:10upx;
width: 208upx;
height: 208upx;
border: 2upx solid #D9D9D9;
}
.uni-uploader__input-box:before,
.uni-uploader__input-box:after {
content: " ";
position: absolute;
top: 50%;
left: 50%;
-webkit-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
background-color: #D9D9D9;
}
.uni-uploader__input-box:before {
width: 4upx;
height: 79upx;
}
.uni-uploader__input-box:after {
width: 79upx;
height: 4upx;
}
.uni-uploader__input-box:active {
border-color: #999999;
}
.uni-uploader__input-box:active:before,
.uni-uploader__input-box:active:after {
background-color: #999999;
}
.uni-uploader__input {
position: absolute;
z-index: 1;
top: 0;
left: 0;
width: 100%;
height: 100%;
opacity: 0;
}
/*问题反馈*/
.feedback-title {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
padding: 20upx;
color: #8f8f94;
font-size: 28upx;
}
.feedback-star-view.feedback-title {
justify-content: flex-start;
margin: 0;
}
.feedback-quick {
position: relative;
padding-right: 40upx;
}
.feedback-quick:after {
font-family: uniicons;
font-size: 40upx;
content: '\e581';
position: absolute;
right: 0;
top: 50%;
color: #bbb;
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
}
.inputsboxss{
height: 100upx;
}
.feedback-body {
background: #fff;
}
.feedback-textare {
height: 200upx;
font-size: 34upx;
line-height: 50upx;
width: 100%;
box-sizing: border-box;
padding: 20upx 30upx 0;
}
.feedback-input {
font-size: 34upx;
height: 50upx;
min-height: 50upx;
padding: 15upx 20upx;
line-height: 50upx;
}
.feedback-uploader {
padding: 22upx 20upx;
}
.feedback-star {
font-family: uniicons;
font-size: 40upx;
margin-left: 6upx;
}
.feedback-star-view {
margin-left: 20upx;
}
.feedback-star:after {
content: '\e408';
}
.feedback-star.active {
color: #FFB400;
}
.feedback-star.active:after {
content: '\e438';
}
.feedback-submit {
background: #ff6900;
color: #FFFFFF;
margin: 20upx;
}
</style>
pages/setup/setup.vue
View file @ f9a65ee2
......@@ -18,11 +18,11 @@
<switch :checked="ischecked" color="#fa436a" @change="switchChange" />
</view>
<!-- <view class="list-cell m-t">
<view class="list-cell m-t" v-if="isshowdy">
<text class="cell-tit">店铺打烊</text>
<switch :checked="ischeckedtwo" color="#fa436a" @change="switchChangetwo" />
</view>
-->
<view class="list-cell m-t b-b" @tap="cleanstore" hover-class="cell-hover" :hover-stay-time="50">
<text class="cell-tit">清除缓存</text>
......@@ -44,6 +44,19 @@
<text class="cell-tit">关于我们</text>
<image class="jiantousi" src="/static/news/jiantousi.png" mode=""></image>
</navigator>
<navigator url="/pages/Agreement/Agreementuser" class="list-cell b-b" hover-class="cell-hover" :hover-stay-time="50">
<text class="cell-tit">用户协议</text>
<image class="jiantousi" src="/static/news/jiantousi.png" mode=""></image>
</navigator>
<navigator url="/pages/Agreement/Agreement" class="list-cell b-b" hover-class="cell-hover" :hover-stay-time="50">
<text class="cell-tit">隐私策略</text>
<image class="jiantousi" src="/static/news/jiantousi.png" mode=""></image>
</navigator>
<navigator url="/pages/feedback/feedback" class="list-cell b-b" hover-class="cell-hover" :hover-stay-time="50">
<text class="cell-tit">意见反馈</text>
<image class="jiantousi" src="/static/news/jiantousi.png" mode=""></image>
</navigator>
<view class="list-cell ali-c" @tap="ToUpdate">
<text class="cell-tit">检查更新</text>
<text class="cell-tip">当前版本 {{version}}</text>
......@@ -64,7 +77,7 @@
</template>
<script>
import {userLogout,deleteStore} from "@/utils/api/api.js";
import {userLogout,deleteStore,storeOpenEle,storeEleInfo} from "@/utils/api/api.js";
import yomolUpgrade from '@/components/yomol-upgrade/yomol-upgrade.vue';//升级组件
export default {
components:{
......@@ -75,11 +88,14 @@
//ischecked:false,//声音提醒开关
version:"1.00",
ischeckedtwo:false,//店铺打烊情况
isshowdy:false,//是否显示打烊按钮
};
},
onLoad() {
this.getv();
console.info(this.version);
this.storeEleInfofun();//查询外卖店铺详情信息
},
computed:{
//选中状态
......@@ -88,6 +104,30 @@
}
},
methods:{
//查询外卖店铺详情信息
async storeEleInfofun(){
let res = await storeEleInfo({
});
if(res.data==null){
this.isshowdy = false;
return false;
}else{
this.isshowdy = true;
}
if(res.code==0){
let is_open = res.data.is_open;//1营业，0打烊
if(is_open==1){//营业
this.ischeckedtwo = false;
}else{//false 打烊中
this.ischeckedtwo = true;
}
}else{
this.$api.msg(res.msg);
}
},
//关闭店铺
todeleteStore(){
console.info("关闭店铺");
......@@ -192,7 +232,21 @@
},
//店铺打烊
switchChangetwo(e){
console.info(e,"打烊修改");
console.info(e.detail.value,"打烊修改");
//is_open 是否打烊（0默认打烊，1营业）
let is_open = e.detail.value?0:1;
storeOpenEle({
is_open:is_open,
}).then((res)=>{
if(res.code==0){
this.$api.msg(res.msg);
}else{
this.$api.msg(res.msg);
}
})
},
cleanstore(){
//清除缓存
......
pages/specsShop/specsShop.scss
View file @ f9a65ee2
......@@ -27,3 +27,50 @@ page{
.submitbtn.active{
background: #FF6900;
}
.specsmodel{
padding:0 24upx;
height: 88upx;
line-height: 88upx;
color:#000000;
font-size: 30upx;
.title{
margin-right: 20upx;
}
.modlename{
}
.dopicon{
width: 40upx;
height: 40upx;
margin-left: 20upx;
}
}
.Checkboxboxmain{
padding:0 24upx;
}
.cleelable{
padding: 10px 15px;
height: 88upx;
line-height: 88upx;
box-sizing: border-box;
.names{
height: 88upx;
line-height: 88upx;
margin-right: 15upx;
.bitian{
color:#ff0000;
}
}
.inputbox{
border-bottom: 1px solid rgb(242, 242, 242);
height: 88upx;
line-height: 88upx;
}
.input{
height: 88upx;
line-height: 88upx;
}
}
\ No newline at end of file
pages/specsShop/specsShop.vue
View file @ f9a65ee2
This diff is collapsed.
utils/api/api.js
View file @ f9a65ee2
......@@ -186,13 +186,32 @@ export function storeMoney(data)
}
//获取模型分类 关联规格的
//获取模型分类 关联规格的 选择分类
export function specTypeList(data)
{
return request.post("Spec/specTypeList",data,{ noAuth : true});
}
//查询商品的规格 商品规格详情 没对
export function goodsSpec(data)
{
return request.post("spec/goodsSpec",data,{ noAuth : true});
}
//spec/ajaxGetSpecSelect
//获取商品详情的规格 查询规格项 获取类型规格详情 没对
export function ajaxGetSpecSelect(data)
{
return request.post("spec/ajaxGetSpecSelect",data,{ noAuth : true});
}
//商品添加规格 商品关联规格
export function addEditProductSpec(data)
{
return request.post("spec/addEditProductSpec",data,{ noAuth : true});
}
//获取规格列表 规格列表
export function specitemList(data)
{
......@@ -385,6 +404,17 @@ export function deleteStore(data)
}
//获取外卖店铺详情 查询店铺打烊情况
export function storeEleInfo(data)
{
return request.post("store/eleInfo",data,{ noAuth : true});
}
//店铺打烊 开关
export function storeOpenEle(data)
{
return request.post("store/openEle",data,{ noAuth : true});
}
utils/debug.js
View file @ f9a65ee2
......@@ -2,8 +2,8 @@
//环境变量 这个是 鹿马商家助手的 商家助手的~~~~
module.exports = {
//是否为开发调试环境 true为本地环境 false 为正式环境
// isdebug:true,//测试
isdebug:false,//正式
isdebug:true,//测试
// isdebug:false,//正式
xqdebug:false,//正式权限
// xqdebug:true,//发布审核权限 也是测试环境的 主要用于ios
......
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