提前点餐

yiren
1 parent ec352012
Showing 6 changed files with 214 additions and 138 deletions
miniprogram/pack-cookbook/pages/cart_new.js
miniprogram/pack-cookbook/pages/cart_new.wxml
miniprogram/pack-cookbook/pages/index_new.js
miniprogram/pack-cookbook/pages/index_new.wxml
miniprogram/pack-cookbook/pages/index_new.wxss
miniprogram/utils/api.url.js
--- a/miniprogram/pack-cookbook/pages/cart_new.js
View file @8dc1169
+++ b/miniprogram/pack-cookbook/pages/cart_new.js
View file @8dc1169
@@ -24,6 +24,7 @@ Page({
         let obj = JSON.parse(wx.getStorageSync('cookbookObj'));
         let cookbooklist = JSON.parse(wx.getStorageSync('cookbooklist'));
         this.formatCookList(cookbooklist);
+        console.log('obj',{...obj});
         this.setData({
             sellerName: obj.sellerName,
             sellerid: obj.sellerid,
@@ -42,23 +43,15 @@ Page({
             items.is_show = false
             items.normsLen = 0
             items.cookbooklist[0].forEach(item => {
-                item.arr = []; //arr 点菜的菜品列表
-                if (item.norms.length > 0) {
+                        console.log(item.norms);
+                if (item.norms && item.norms.length > 0) {
                     item.norms.forEach(i => {
-                        let obj = {
-                            name: item.name,
-                            practice: i.practice,
-                            unit: i.unit,
-                            price: i.price,
-                            quantum: i.quantum,
-                        }
-                        item.arr.push(obj)
                         let price = i.quantum * 1 * (i.price * 1);
                         probablyPrice += price;
                     })
                     noData = true
                     items.is_show = true; //展示不展示
-                    items.normsLen += item.arr.length; //菜品数量
+                    items.normsLen += item.norms.length; //菜品数量
                 }
             })
         })
--- a/miniprogram/pack-cookbook/pages/cart_new.wxml
View file @8dc1169
+++ b/miniprogram/pack-cookbook/pages/cart_new.wxml
View file @8dc1169
@@ -25,10 +25,10 @@
 				<view class="rightTitle">{{item.normsLen}}道</view>
 			</view>
 			<block wx:for="{{item.cookbooklist[0]}}" wx:key="{{item.id}}" wx:for-index="index">
-				<block wx:if="{{item.arr.length>0}}">
-					<view wx:for="{{item.arr}}" wx:for-index="idx" class="content flex-lr">
-						<view class="single">{{item.name}}<text>({{item.practice}})</text></view>
-						<view class="price">{{item.price}}元/{{item.unit}}</view>
+				<block wx:if="{{item.norms.length>0}}">
+					<view wx:for="{{item.norms}}" wx:for-index="idx" class="content flex-lr">
+						<view class="single">{{item.name}}<text>({{item.practiceName}})</text></view>
+						<view class="price">{{item.price}}元/{{item.unitName}}</view>{{item.price}}
 						<view class="count flex-cc">
 							<image bindtap="countFun" data-type="0" data-indexs="{{indexs}}" data-index="{{index}}" data-idx="{{idx}}" src="https://qn.colorcun.com/WechatIMG809.png" class="img1" mode="" />
 							{{item.quantum}}
--- a/miniprogram/pack-cookbook/pages/index_new.js
View file @8dc1169
+++ b/miniprogram/pack-cookbook/pages/index_new.js
View file @8dc1169
@@ -14,8 +14,8 @@ Page({
     options: {},
     check1: '', //做法
     check2: '', //规格
-    check1Name:'',
-    check2Name:'',
+    check1Name: '',
+    check2Name: '',
     isloading: true,
     toView: "inToView27",
     hasEnter: false,
@@ -32,6 +32,9 @@ Page({
     checkObj: '',
     normsIndex: '',
     assortArr: [],
+    themeColor:'',
+    textColor:'',
+    navColor:'',
   },
   checkModal: '',
   classifyModal: '',
@@ -80,25 +83,26 @@ Page({
   // 选择做法
   checkSingle1(e) {
     const item = e.currentTarget.dataset['item'];
-    let checkItem=this.data.checkItem
-    checkItem.check1=item.id
+    let checkItem = this.data.checkItem
+    checkItem.check1 = item.id
     this.setData({
-      check1:item.id,
-      check1Name:item.name,
+      check1: item.id,
+      check1Name: item.name,
       checkItem
     })
   },
   // 选择规格
   checkSingle2(e) {
     const item = e.currentTarget.dataset['item'];
-    let checkItem=this.data.checkItem
-    checkItem.check2=item.id
+    let checkItem = this.data.checkItem
+    checkItem.check2 = item.id
     this.setData({
-      check2:item.id,
-      check2Name:item.specs,
+      check2: item.id,
+      check2Name: item.specs,
       checkItem
     })
   },
+  // 获取点菜数量
   getNormsLen() {
     let cookbooklist = this.data.cookbooklist;
     let normsLen = 0;
@@ -140,13 +144,15 @@ Page({
         cookbooklist: this.data.cookbooklist,
       })
     } else {
+      console.log({...data});
       let obj = {
         quantum: 1,
-        practice: this.data.check1?this.data.check1:data.check1,
-        unit: this.data.check2?this.data.check2:data.check2,
-        practiceName:this.data.check1Name?this.data.check1Name:data.check1Name,
-        unitName:this.data.check2Name?this.data.check2Name:data.check2Name,
-        price
+        name:data.name,
+        practice: this.data.check1 ? this.data.check1 : data.check1,
+        unit: this.data.check2 ? this.data.check2 : data.check2,
+        practiceName: this.data.check1Name ? this.data.check1Name : data.check1Name,
+        unitName: this.data.check2Name ? this.data.check2Name : data.check2Name,
+        price:price?price:''
       }
       this.data.cookbooklist[indexs].cookbooklist[0][index].norms.push(obj)
       this.setData({
@@ -175,29 +181,33 @@ Page({
     let norms = this.data.cookbooklist[indexs].cookbooklist[0][index].norms
     let normsNum;
     // 点击下面的加号并且有规格或者做法的，弹框选规格  下面的直接加
-    if (type == '1' && (item.practice.length>1 || item.spec.length>1)) {
+    if (type == '1' && (item.practice.length > 1 || item.spec.length > 1)) {
       this.setData({
-        check1:item.practice.length>0?item.practice[0].id:'',
-        check2:item.spec.length>0?item.spec[0].id:'',
+        check1: item.practice[0].id,
+        check2: item.spec[0].id,
+        check1Name:item.practice[0].name,
+        check2Name:item.spec[0].spec,
       })
       return this.showModal()
-    }else {
+    } else {
       normsNum = 1;
-      let obj={
-        quantum:normsNum,
+      let obj = {
+        quantum: normsNum,
         practice: item.check1Name,
-        unit:item.unit,
-        practiceName:item.check1Name,
-        unitName:item.check2Name,
+        unit: item.unit,
+        practiceName: item.check1Name,
+        unitName: item.check2Name,
+        name:item.name,
+        price:item.price,
       }
-      if(!normsIndex && norms.length == '0'){
+      if (!normsIndex && norms.length == '0') {
         this.data.cookbooklist[indexs].cookbooklist[0][index].norms.push(obj)
       }
     }
     if (type == '0' && norms.length != '0') {
       normsNum = this.data.cookbooklist[indexs].cookbooklist[0][index].norms[normsIndex].quantum * 1 + 1;
       this.data.cookbooklist[indexs].cookbooklist[0][index].norms[normsIndex].quantum = normsNum;
-    }else{
+    } else {
       normsNum = 1
     }
     this.setData({
@@ -264,6 +274,7 @@ Page({
     let assortArr = [];
     let check1 = '';
     let check2 = '';
+    let that=this;
     if (list.length > 0) {
       has10CaiOpen = list[0].status == 1;
       list.forEach(function (cate, i) {
@@ -313,14 +324,14 @@ Page({
                   cook.norms = []; //做法规格
                 }
                 cook.type = '1';
-                let cook_style=cook.cook_style?JSON.parse(cook.cook_style):'';
+                let cook_style = cook.cook_style?that.determine(cook.cook_style):'';//判断是不是json，是json在转换为对象
                 cook.cook_style = cook_style;
-                cook.image_type = cook_style.image_type?cook_style.image_type:'1';//1大图,2小图  默认大图
-                cook.name_type = cook_style.name_type?cook_style.name_type:'3';//1左侧,2右侧,3顶部分开  默认分开
-                cook.check1 = cook.practice.length>0?cook.practice[0].id:'';
-                cook.check2 = cook.spec.length>0?cook.spec[0].id:'';
-                cook.check1Name = cook.practice.length>0?cook.practice[0].name:'';
-                cook.check2Name = cook.spec.length>0?cook.spec[0].specs:'';
+                cook.image_type = cook_style && cook_style.image_type ? cook_style.image_type : '1'; //1大图,2小图  默认大图
+                cook.name_type = cook_style && cook_style.name_type ? cook_style.name_type : '3'; //1左侧,2右侧,3顶部分开  默认分开
+                cook.check1 = cook.practice.length > 0 ? cook.practice[0].id : '';
+                cook.check2 = cook.spec.length > 0 ? cook.spec[0].id : '';
+                cook.check1Name = cook.practice.length > 0 ? cook.practice[0].name : '';
+                cook.check2Name = cook.spec.length > 0 ? cook.spec[0].specs : '';
                 if (item_clear_num == 0) {
                   flag = false;
                 }
@@ -340,41 +351,63 @@ Page({
         }
       })
     }
-    let sortArr=[]
-    flist.forEach(item=>{
-      item.cookbooklist[0].sort((a,b)=>{
-        return a.order_o-b.order_o
+    // 排序
+    let sortArr = []
+    flist.forEach(item => {
+      item.cookbooklist[0].sort((a, b) => {
+        return a.order_o - b.order_o
       })
       sortArr.push(item)
     })
-    let image_typeArr=[];
-    sortArr.forEach(item=>{
-      let num=0;
-      item.cookbooklist[0].forEach((i,idx)=>{
-        if(i.image_type=='2'){
+    // 大小图设置边框
+    let image_typeArr = [];
+    sortArr.forEach(item => {
+      let num = 0;
+      item.cookbooklist[0].forEach((i, idx) => {
+        if (i.image_type == '2') {
           num++
-          i.index=num;
-          if(i.index%2!=0){
-            i.boderNone=false;
-          }else{
-            i.boderNone=true;
+          i.index = num;
+          if (i.index % 2 != 0) {
+            i.boderNone = false;
+          } else {
+            i.boderNone = true;
           }
           // 下一个是大图  不是最后一个
-          if(item.cookbooklist[0][idx+1].image_type=='1' && idx!=item.cookbooklist[0].length-1){
+          if (item.cookbooklist[0][idx + 1].image_type == '1' && idx != item.cookbooklist[0].length - 1) {
             // 是奇数
-            if(num%2!=0){
-              let s=i.index*1+1;
-              item.cookbooklist[0].splice(idx+1,0,{index:s,boderNone:true})
+            if (num % 2 != 0) {
+              let s = i.index * 1 + 1;
+              item.cookbooklist[0].splice(idx + 1, 0, {
+                index: s,
+                boderNone: true
+              })
             }
           }
-        }else if(i.image_type=='1'){
-          i.index=0
-          num=0
+        } else if (i.image_type == '1') {
+          i.index = 0
+          num = 0
         }
       })
       image_typeArr.push(item)
     })
-    console.log('image_typeArr',image_typeArr);
+    // 获取所有的规格
+    image_typeArr.forEach(item => {
+      item.cookbooklist[0].forEach((i, idx) => {
+        i.specArr=[]
+        if(i.spec && i.spec.length>0){
+          i.spec.forEach(sigin=>{
+            if(sigin.status=='1'){
+              let obj={
+                str:'￥'+i.price+'/'+i.specs
+              }
+              i.specArr.push(sigin)
+            }
+          })
+        }
+        console.log(i.specArr);
+      })
+    })
+    
     setTimeout(() => {
       this.setData({
         check1,
@@ -382,10 +415,22 @@ Page({
         assortArr
       })
     }, 1);
+    console.log(image_typeArr);
     return image_typeArr;
   },
+  // 判断
+  determine(str) {
+    if (typeof str == 'string') {
+      try {
+        var obj = JSON.parse(str);
+        return obj;
+      } catch (e) {
+        return false;
+      }
+    }
+  },
   // 获取所有分类下所有菜品列表
-  getCookList(orderid) {
+  getCookList() {
     let cookbooklist = wx.getStorageSync('cookbooklist');
     let cookbooklistStorage = cookbooklist ? JSON.parse(cookbooklist) : '';
     console.log('cookbooklist历史数据', cookbooklistStorage);
@@ -402,9 +447,9 @@ Page({
         orderid: this.data.options.oid,
         status: '0,1',
       };
-      App.Advance.GetCookbookByClass(param).then(json => {
-        let cookbooklist=this.formatCookList(json.data[0].list)
-        // console.log('cookbooklist',cookbooklist);
+      App.Cookbook.GetCookbookByClass(param).then(json => {
+        let cookbooklist = this.formatCookList(json.data[0].list)
+        console.log('cookbooklist', cookbooklist);
         setTimeout(() => {
           this.setData({
             cookbooklist,
@@ -416,6 +461,34 @@ Page({
         console.log(res);
       });
     }
+    this.GetDzSellerConfFun()
+  },
+  GetDzSellerConfFun() {
+    App.Seller.GetDzSellerConf({
+      sid: this.data.options.sid
+    }).then(res => {
+      if(res.data.cook_style){
+        let style=this.determine(res.data.cook_style)
+        let themeColor,textColor,navColor;
+        if(style && style.red && style.green && style.blue && style.alpha){
+          themeColor=style.red + ',' + style.green + ',' + style.blue + ',' + Math.floor(style.alpha)
+        }else{
+          themeColor ='77,78,80,1'
+        }
+        if(themeColor=='251,246,241,1'){
+          textColor="81,81,81,1"
+          navColor="81,81,81,1"
+        }else{
+          navColor="255,255,255,1"
+        }
+        this.setData({
+          themeColor,
+          textColor,
+          navColor
+        })
+        console.log(themeColor);
+      }
+    })
   },
   /**
    * 生命周期函数--监听页面显示
--- a/miniprogram/pack-cookbook/pages/index_new.wxml
View file @8dc1169
+++ b/miniprogram/pack-cookbook/pages/index_new.wxml
View file @8dc1169
 <!--pack-cookbook/pages/index_new.wxml-->
-<nav backgroundColor="#4d4e50" color="#fff">{{options.sellerName||'提前点菜'}}</nav>
+<nav backgroundColor="rgba({{themeColor}})" color="rgba({{navColor}})">{{options.sellerName||'提前点菜'}}</nav>
 <loading wx:if="{{isloading}}">数据加载中</loading>
-<scroll-view style="height:100vh;" class="content" scroll-into-view="{{toView}}" scroll-y="true" scroll-with-animation="true">
+<scroll-view style="height:100vh;background: rgba({{themeColor}});" class="content" scroll-into-view="{{toView}}" scroll-y="true" scroll-with-animation="true">
 	<block wx:for="{{cookbooklist}}" wx:key="cookbooklist-key" wx:for-index="indexs">
 		<view class="dishWrap" id="{{ 'inToView'+item.id}}">
-			<block wx:if="{{item.class_type=='1'}}">
+			<block>
 				<view class="heand flex-vc flex-cc">
 					<view class="style_round flex-vc flex-cc">
 						<view class="round"></view>
@@ -20,92 +20,74 @@
 			<block wx:for="{{item.cookbooklist[0]}}" wx:key="{{item.id}}" wx:for-index="index">
 				<!-- name_type  1左侧,2右侧,3顶部分开  image_type  1大图,2小图 -->
 				<view wx:if="{{item.image_type=='1'}}" class="oneBox" data-idx="{{item.index}}">
-					<view class="dishItem flex-lr">
-						<view class="dishLeft dishTexts">{{item.name}}</view>
-						<view class="dishTexts dishRight">味型：price</view>
-					</view>
-					<view class="norms">味型：{{item.taste}}</view>
-					<block wx:if="{{type=='B'}}">
-						<view class="dishItem typeB">
-							<view class="dishLeft dishTexts">{{item.title}}</view>
-							<view class="dishTexts dishRight">{{item.first_name}}</view>
+					<view class="dishItem {{item.name_type=='2'?'typeB':item.name_type=='3'?'flex-lr':''}}">
+						<view class="dishLeft dishTexts" style="color:rgba({{textColor}})">
+							{{item.name}}
 						</view>
-						<view class="norms normsB">{{item.first_name}}</view>
-					</block>
-					<block wx:if="{{type=='C'}}">
-						<view class="dishItem">
-							<view class="dishLeft dishTexts">{{item.title}}</view>
-							<view class="dishTexts dishRight">{{item.first_name}}</view>
+						<view wx:if="{{item.taste}}" class="dishTexts dishRight" style="color:rgba({{textColor}})">
+							味型：{{item.taste}}
 						</view>
-						<view class="norms">{{item.first_name}}</view>
-					</block>
-					<image wx:if="{{item.image}}" src="{{item.image}}" class="dishImg" mode="aspectFill" />    
+					</view>
+					<view class="norms {{item.name_type=='2'?'normsB':''}}" 
+						style="color:rgba({{textColor}})">
+					{{item.price?'￥'+item.price+'/'+item.specs:''}}
+					{{item.member_price?'会员￥'+item.member_price+'/'+item.specs:''}}
+					</view>
+					<image wx:if="{{item.image}}" src="{{item.image}}" class="dishImg" mode="aspectFill" />
 					<view class="greens">
-						<view class="news">{{item.first_name}}</view>
+						<view class="news" style="color:rgba({{textColor}})">{{item.first_name}}</view>
 					</view>
 					<view wx:for="{{item.norms}}" wx:for-index="normsIndex" class="algorithmImg flex-lr calculate">
-						<image src="https://qn.colorcun.com/WechatIMG697.png" mode="aspectFill" class="reduceImg" bindtap="subtraction" data-item="{{item}}" data-norms="{{normsIndex}}" data-key="{{index}}" data-indexs="{{indexs}}" />
+						<image src="{{themeColor!='251,246,241,1'?'https://qn.colorcun.com/WechatIMG697.png':'https://qn.colorcun.com/Line2.png'}}" mode="aspectFill" class="reduceImg" bindtap="subtraction" data-item="{{item}}" data-norms="{{normsIndex}}" data-key="{{index}}" data-indexs="{{indexs}}" />
 						<view class="box flex-cc">
 							<view class="num flex-cc">
-								{{item.quantum}}<view>{{item.unitName}}</view>
+								{{item.quantum}}<view style="color:rgba({{textColor}})">{{item.unitName}}</view>
 							</view>
-							<view class="practice">{{item.practiceName}}</view>
+							<view class="practice" style="color:rgba({{textColor}})">{{item.practiceName}}</view>
 						</view>
-						<image src="https://qn.colorcun.com/WechatIMG696.png" mode="aspectFill" class="imgs" data-type="0" bindtap="addition" data-norms="{{normsIndex}}" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" />
+						<image src="{{themeColor!='251,246,241,1'?'https://qn.colorcun.com/WechatIMG696.png':'https://qn.colorcun.com/Line1.png'}}" mode="aspectFill" class="imgs" data-type="0" bindtap="addition" data-norms="{{normsIndex}}" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" />
 					</view>
 					<view wx:if="{{(item.spec.length>1 || item.practice.length>1) || item.norms.length=='0'}}" class="algorithmImg flex-rr imgbox">
-						<image src="https://qn.colorcun.com/WechatIMG696.png" class="imgs" mode="aspectFill" bindtap="addition" data-norms="{{normsIndex}}" data-type="1" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" />
+						<image src="{{themeColor!='251,246,241,1'?'https://qn.colorcun.com/WechatIMG696.png':'https://qn.colorcun.com/Line1.png'}}" class="imgs" mode="aspectFill" bindtap="addition" data-norms="{{normsIndex}}" data-type="1" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" />
 					</view>
-					<!-- <view class="wrapIine"></view> -->
 				</view>
 				<view wx:else class="twoBox" data-idx="{{item.index}}">
 					<view class="{{item.boderNone?'borderNone twoItem':'twoItem'}}">
-						<view class="twoTitle">{{item.name}}</view>
+						<view class="twoTitle" style="color:rgba({{textColor}})">{{item.name}}</view>
 						<view class="twoInfo">{{item.info}}{{item.vip}}</view>{{item.quantum}}
 						<image src="{{item.image}}" mode="aspectFill" />
 						<view wx:for="{{item.norms}}" wx:for-index="normsIndex" class="algorithmImg flex-lr calculate">
-							<image src="https://qn.colorcun.com/WechatIMG697.png" mode="aspectFill" class="reduceImg" bindtap="subtraction" data-item="{{item}}" data-norms="{{normsIndex}}" data-key="{{index}}" data-indexs="{{indexs}}" />
+							<image src="{{themeColor!='251,246,241,1'?'https://qn.colorcun.com/WechatIMG697.png':'https://qn.colorcun.com/Line2.png'}}" mode="aspectFill" class="reduceImg" bindtap="subtraction" data-item="{{item}}" data-norms="{{normsIndex}}" data-key="{{index}}" data-indexs="{{indexs}}" />
 							<view class="box flex-cc">
 								<view class="num flex-cc">
-									{{item.quantum}}<view>{{item.unitName}}</view>
+									{{item.quantum}}<view style="color:rgba({{textColor}})">{{item.unitName}}</view>
 								</view>
-								<view class="practice">{{item.practiceName}}</view>
+								<view class="practice" style="color:rgba({{textColor}})">{{item.practiceName}}</view>
 							</view>
-							<image src="https://qn.colorcun.com/WechatIMG696.png" mode="aspectFill" class="imgs" data-type="0" bindtap="addition" data-norms="{{normsIndex}}" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" />
+							<image src="{{themeColor!='251,246,241,1'?'https://qn.colorcun.com/WechatIMG696.png':'https://qn.colorcun.com/Line1.png'}}" mode="aspectFill" class="imgs" data-type="0" bindtap="addition" data-norms="{{normsIndex}}" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" />
 						</view>
 						<view wx:if="{{(item.spec.length>1 || item.practice.length>1) || item.norms.length=='0'}}" class="algorithmImg flex-rr imgbox">
-							<image src="https://qn.colorcun.com/WechatIMG696.png" class="imgs" mode="aspectFill" bindtap="addition" data-norms="{{normsIndex}}" data-type="1" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" />
+							<image src="{{themeColor!='251,246,241,1'?'https://qn.colorcun.com/WechatIMG696.png':'https://qn.colorcun.com/Line1.png'}}" class="imgs" mode="aspectFill" bindtap="addition" data-norms="{{normsIndex}}" data-type="1" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" />
 						</view>
-						<!-- <view class="wrapIine"></view> -->
-						<!-- <view class="algorithmImg flex-rr oneImg">
-							<image src="https://qn.colorcun.com/WechatIMG696.png" mode="aspectFill" class="imgs" bindtap="subtraction" data-item="{{item}}" data-norms="{{normsIndex}}" data-key="{{index}}" data-indexs="{{indexs}}" />
-						</view>
-						<view wx:if="{{(item.spec.length>1 || item.practice.length>1) || item.norms.length=='0'}}" class="algorithmImg flex-lr twoImgs">
-							<image src="https://qn.colorcun.com/WechatIMG697.png"  mode="aspectFill" class="imgs" data-type="0" bindtap="addition" data-norms="{{normsIndex}}" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" />
-							<view class="box flex-cc">
-								<view class="num flex-cc">{{item.quantum}}</view>
-							</view>
-							<image src="https://qn.colorcun.com/WechatIMG696.png" class="imgs" mode="aspectFill" bindtap="addition" data-norms="{{normsIndex}}" data-type="1" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}"/>
-						</view> -->
 					</view>
 				</view>
 			</block>
 		</view>
 	</block>
 </scroll-view>
-<view class="fixedBox flex-lr">
+<view class="fixedBox flex-lr" style="background: rgba({{themeColor}});">
 	<view class="left flex-cmc" bindtap="showClassifyModal">
-		<image src="https://qn.colorcun.com/WechatIMG700.png" mode="" />
-		<view class="fixedName">
+		<image src="{{themeColor!='251,246,241,1'?'https://qn.colorcun.com/WechatIMG700.png':'https://qn.colorcun.com/s1.png'}}" mode="" />
+		<view class="fixedName" style="color:rgba({{textColor}})">
 			菜品分类
 		</view>
 	</view>
 	<view class="right flex-cmc" bindtap="gotoShoppingCart">
 		<view class="rightBox">
-			<image src="https://qn.colorcun.com/WechatIMG701.png" mode="" />
+			<image src="{{themeColor!='251,246,241,1'?'https://qn.colorcun.com/WechatIMG701.png':'https://qn.colorcun.com/s2.png'}}" mode="" />
 			<view class="num" wx:if="{{normsLen}}">{{normsLen}}</view>
 		</view>
-		<view class="fixedName">
+		<view class="fixedName" style="color:rgba({{textColor}})">
 			已选菜品
 		</view>
 	</view>
--- a/miniprogram/pack-cookbook/pages/index_new.wxss
View file @8dc1169
+++ b/miniprogram/pack-cookbook/pages/index_new.wxss
View file @8dc1169
 /* pack-cookbook/pages/index_new.wxss */
 page {
-	background-color: #4d4e50;
 	width: 100%;
 	height: 100vh;
 	display: block;
@@ -9,7 +8,9 @@ page {
 	overflow-x: hidden;
 	box-sizing: border-box;
 }
-
+.dishItem {
+	padding: 0 0 30rpx 0;
+}
 .wrapIine {
 	height: 4rpx;
 	width: 100%;
@@ -50,12 +51,12 @@ page {
 	border-top: 4rpx solid #dbdbdb;
 }
 .dishTexts {
-	padding: 0 40rpx;
-	color: #dbdbdb;
+	padding: 20rpx 40rpx 0 40rpx;
+	color: #000;
 	font-family: PingFang SC;
 	font-weight: 500;
 	font-size: 40rpx;
-	-webkit-text-stroke: 1rpx black;
+	-webkit-text-stroke: 1rpx #fff;
 }
 .dishRight {
@@ -65,11 +66,11 @@ page {
 }
 .norms {
-	margin-top: 10rpx;
-	color: #dbdbdb;
+	color: #000;
 	font-family: PingFang SC;
 	font-size: 24rpx;
 	padding: 0 40rpx 30rpx 40rpx;
+	-webkit-text-stroke: 1rpx #fff;
 }
 .dishImg {
@@ -89,13 +90,15 @@ page {
 	height: 60rpx;
 	padding-bottom: 58rpx;
 }
-.imgbox{
-	margin-right: 20rpx;
+.oneBox .imgbox{
+	margin-right: 80rpx;
 }
 .twoItem .algorithmImg{
 	padding-top: 20rpx;
 }
-
+.twoItem .imgbox{
+	margin-right: 20rpx;
+}
 .algorithmImg .imgs {
 	width: 60rpx;
 	height: 100%;
@@ -105,6 +108,10 @@ page {
 	padding: 20rpx 20rpx 58rpx 20rpx;
 }
+.oneBox .calculate{
+	padding-right: 80rpx;
+}
+
 .calculate .imgs {
 	width: 60rpx;
 	height: 60rpx;
@@ -116,8 +123,12 @@ page {
 	font-family: PingFang SC;
 	font-weight: 500;
 	font-size: 80rpx;
+	-webkit-text-stroke: 1rpx #fff;
+}
+.practice{
+	font-family: PingFang SC;
+	padding-right: 10rpx;
 }
-
 .num view {
 	color: #dbdbdb;
 	font-family: PingFang SC;
@@ -137,18 +148,20 @@ page {
 }
 .twoTitle {
 	padding: 30rpx 0 10rpx 20rpx;
-	color: #dbdbdb;
+	color: #000;
 	font-family: PingFang SC;
 	font-weight: 500;
 	font-size: 40rpx;
+	-webkit-text-stroke: 1rpx #fff;
 }
 .twoInfo {
-	color: #dbdbdb;
+	color: #000;
 	font-family: PingFang SC;
 	font-weight: 500;
 	font-size: 24rpx;
 	padding: 0 0 30rpx 20rpx;
+	-webkit-text-stroke: 1rpx #fff;
 }
 .twoItem image {
@@ -179,6 +192,7 @@ page {
 .reduceImg {
 	width: 70rpx;
 	height: 8rpx !important;
+	padding: 10rpx;
 }
 .fixedBox {
@@ -188,7 +202,6 @@ page {
 	width: 100%;
 	padding: 18rpx 80rpx 18rpx 80rpx;
 	box-sizing: border-box;
-	background-color: #4D4E50;
 }
 .fixedBox .left image {
@@ -286,6 +299,11 @@ page {
 	color: #E34D59;
 	border: 2rpx solid #E34D59;
 }
+.style_round .line {
+	width: 100rpx;
+	height: 2rpx;
+	background: #dbdbdb;
+}
 .checkLine {
 	width: 100%;
--- a/miniprogram/utils/api.url.js
View file @8dc1169
+++ b/miniprogram/utils/api.url.js
View file @8dc1169
@@ -685,4 +685,14 @@ export default {
   'App.Activity.GetNewRechargeList':{
 		openid:'openid'
   },
+  
+  // 获取商家订座配置
+  'App.Seller.GetDzSellerConf':{
+		openid:'openid'
+  },
+  
+  // 获取所有分类下所有菜品列表
+  'App.Cookbook.GetCookbookByClass':{
+		openid:'openid'
+  },
 }