Administrator / xcx-take · Commits

Go to a project

Commit 33e7be5b724f9e137d7ae2590869b1d5a167c3e9

Authored by Yolanda
1 parent 1c6c84f3
build: skipped

02.22修改

Inline Side-by-side
Showing 10 changed files with 17 additions and 10 deletions
... ... @@ -2,10 +2,10 @@
<image src="{{item.image ? item.image : 'http://nosqn.colorcun.com/empty.jpg'}}" class="food-image bg-gray" mode="aspectFill" lazy-load></image>
<view class="food-info flex-vtb">
<view class="smooth">
<view class="font-more font-bold font32r black-font" style="width:320rpx;margin-bottom: 6rpx;">{{item.name}}</view>
<view class="gray-font font24r font-more-two" wx:if="{{item.desc}}" style="width:320rpx;">{{item.desc}}</view>
<view class="font-more-two font-bold font32r black-font" style="width:320rpx;margin-bottom: 6rpx;">{{item.name}}</view>
<!-- <view class="gray-font font24r font-more" wx:if="{{item.desc}}" style="width:320rpx;">{{item.desc}}</view> -->
</view>
<view class="flex-lr">
<view class="flex-lr" style="width: 100%;">
<view class="food-price flex-ll">
<view class="red-pink-font font24r" style="margin-right:12rpx;">￥<text class="font36r font-bold">{{item.member_price && item.member_price!=0 ? item.member_price : item.price}}</text></view>
<view class="gray-light-font font20r" style="text-decoration: line-through;" wx:if="{{item.member_price && item.member_price!=0}}">￥<text class="font28r">{{item.price}}</text></view>
... ...
... ... @@ -11,6 +11,7 @@ Component({
attached(){
console.log('uuuuu',this.data.seller)
this.getsellerconfig();
this.gettotal();
},
observers: {
'refresh': function(newrefresh){
... ...
<view style="overflow:hidden;">
<nav backgroundColor="#199095" color="#ffffff">添加菜品</nav>
<view class="bg_white content" style="height:{{scrollHeight}}px">
<input class="content1 black-font smooth font36r" bindinput="cooknameInput" type="text" value="{{cook_name}}" placeholder="点这里，输入菜品名称" data-key="total" placeholder-style="color:#999;font-size:36rpx;font-weight:bold;" placeholder-class="smooth" maxlength="10" style="min-height:40rpx;"/>
<input class="content1 black-font smooth font36r" bindinput="cooknameInput" type="text" value="{{cook_name}}" placeholder="点这里，输入菜品名称" data-key="total" placeholder-style="color:#999;font-size:36rpx;font-weight:bold;" placeholder-class="smooth" maxlength="20" style="min-height:40rpx;"/>
</view>
<view class="bg1"></view>
<block wx:if="{{reminderInfo}}">
... ...
... ... @@ -22,7 +22,7 @@
</block>
<view style="width:100%;padding:0 45rpx;padding-top:75rpx;padding-bottom:20rpx;box-sizing:border-box;background:#fff;">
<view class="menu-title-top flex-lr">
<view class="black-font font44r smooth" stylw="width:80%;"><input type="text" value="{{name}}" placeholder="请输入菜品名" placeholder-style="color:#999;" placeholder-class="smooth font34r" style="width:100%;font-weight:bold;height:64rpx;line-height:64rpx;" name="name" bindinput="changeName" maxlength="10" bindblur="getinfo"/></view>
<view class="black-font font44r smooth" stylw="width:80%;"><input type="text" value="{{name}}" placeholder="请输入菜品名" placeholder-style="color:#999;" placeholder-class="smooth font34r" style="width:100%;font-weight:bold;height:64rpx;line-height:64rpx;" name="name" bindinput="changeName" maxlength="20" bindblur="getinfo"/></view>
<switchLiu definecheked="{{status}}" id="switch" bind:changecookstatus="cookswitch"></switchLiu>
</view>
<view class="flex-vr" style="margin-top:10rpx;align-items:flex-end;">
... ...
... ... @@ -84,7 +84,7 @@
<view class="order-food-single flex-lr smooth" style="align-items: flex-start;" wx:if="{{hasmore ? index<3 : index<cartlist.length}}">
<view class="flex-ll">
<image class="food-image bg-gray" src="{{item.cookimage ? item.cookimage : 'http://nosqn.colorcun.com/empty.jpg'}}" mode="aspectFill"></image>
<view class="">
<view class="" style="width:360rpx;">
<view class="black-font font32r font-bold">{{item.cookname}}</view>
<view class="gray-font font28r" wx:if="{{item.spec_name || item.practice_name}}">{{item.spec_name ? item.spec_name : ''}}{{item.practice_name && item.spec_name ? ',' : ''}}{{item.practice_name ? item.practice_name : ''}}</view>
<view class="gray-font font28r">x {{item.count}}</view>
... ...
... ... @@ -170,6 +170,7 @@ Page({
})
},
refreshprice(){
console.log('rrrr')
this.setData({
refresh:true
})
... ... @@ -180,6 +181,7 @@ Page({
reduceitem:this.data.cooklist[e.detail.classidx].cookbookList[0][e.detail.cookidx]
})
this.selectComponent('#rmodal').showrmodal();
// this.refreshprice();
},
showspec(e){
console.log(e,'showspec',this.selectComponent('#spec'));
... ... @@ -187,6 +189,7 @@ Page({
additem:this.data.cooklist[e.detail.classidx].cookbookList[0][e.detail.cookidx]
})
this.selectComponent('#spec').show();
// this.refreshprice();
},
tellfood(e){
console.log(e,'actfood')
... ...
... ... @@ -38,7 +38,7 @@
<view class="order-food-single flex-lr smooth" style="align-items: flex-start;" wx:if="{{hasmore ? index<3 : index<cartlist.length}}">
<view class="flex-ll">
<image class="food-image bg-gray" src="{{item.cookimage ? item.cookimage : 'http://nosqn.colorcun.com/empty.jpg'}}" mode="aspectFill"></image>
<view class="">
<view class="" style="width:360rpx;">
<view class="black-font font32r font-bold">{{item.cookname}}</view>
<view class="gray-font font28r" wx:if="{{item.spec_name || item.practice_name}}">{{item.spec_name ? item.spec_name : ''}}{{item.practice_name && item.spec_name ? ',' : ''}}{{item.practice_name ? item.practice_name : ''}}</view>
<view class="gray-font font28r">x {{item.count}}</view>
... ...
... ... @@ -187,9 +187,9 @@ Page({
this.onShow();
},
getlist(page){
App.Orders.GetOrderListByOpenid({openid:util.cache('openid'),page:page,size:10,sellerid:util.cache('sellerid'),status:this.data.statusidx+1}).then((json)=>{
App.Orders.GetOrderBySellerid({openid:util.cache('openid'),page:page,size:10,sellerid:util.cache('sellerid'),status:this.data.statusidx+1}).then((json)=>{
console.log(json)
if(json.ret==200){
if(json.ret==200 && json.data){
json.data.forEach((v,i)=>{
v.showdate=util.unixtoTime(v.cdate,'YYYY/MM/DD HH:II');
v.sdate=util.unixtoTime(v.sd_time.split('-')[0],'YYYY/MM/DD HH:II')
... ...
... ... @@ -37,7 +37,7 @@
"minifyWXSS": true
},
"compileType": "miniprogram",
"libVersion": "2.14.4",
"libVersion": "2.0.9",
"appid": "wx418f1d7cdeda26c1",
"projectname": "%E8%87%AA%E8%90%A5%E5%A4%96%E5%8D%96",
"simulatorType": "wechat",
... ...
... ... @@ -121,6 +121,9 @@ export default {
'App.Orders.SetOrderById':null,
'App.Orders.GetOrderBySellerid':null,
//清空购物车
'App.Orders.ClearCar':null,
... ...