Merge branch 'cjn_branch' of https://bdgit.educoder.net/pp5jxn7yq/campus_leader

README.md

@@ -1,3 +1,3 @@
 # campus_leader
 polo car
-111
+111111222233

others/cjn.txt

@@ -0,0 +1 @@
+cjnpp

src/canteen.js

@@ -0,0 +1,78 @@
+// pages/canteen/canteen.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    },
+    goEvaluate:function(options){
+        
+        wx.navigateTo({
+          url: '../evaluate/evaluate'
+        })
+    },
+    goCwindow:function(options){
+        
+        wx.navigateTo({
+          url: '../cwindow/cwindow'
+        })
+    },
+})

src/canteen.json

@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}

src/canteen.wxml

@@ -0,0 +1,36 @@
+<!--pages/canteen/canteen.wxml-->
+<view class = "container">
+    <view class  = "word">
+        <text>窗口1:\n
+        窗口详情:\n
+       评分:x.x</text>
+    </view>
+       <button size="mini" type="primary"class="tapbtn1" bindtap="goEvaluate">评价菜品</button>
+    <button size="mini" type="default"class="tapbtn2" bindtap="goCwindow">查看评价</button>
+</view>
+<view class="divLineX"></view>
+<!--pages/canteen/canteen.wxml-->
+<view class = "container">
+    <view class  = "word">
+        <text>窗口:2\n
+        窗口详情:\n
+       评分:</text>
+    </view>
+       <button size="mini" type="primary"class="tapbtn1" bindtap="goEvaluate">评价菜品</button>
+       <button size="mini" type="default"class="tapbtn2" bindtap="goCwindow">查看评价</button>
+</view>
+<view class="divLineX"></view>
+
+<!--pages/canteen/canteen.wxml-->
+<view class = "container">
+    <view class  = "word">
+        <text>窗口3:\n
+        窗口详情:\n
+       评分:</text>
+    </view>
+       <button size="mini" type="primary"class="tapbtn1" bindtap="goEvaluate">评价菜品</button>
+    <button size="mini" type="default"class="tapbtn2" bindtap="goCwindow">查看评价</button>
+</view>
+<view class="divLineX"></view>
+
+

src/canteen.wxss

@@ -0,0 +1,37 @@
+/* pages/canteen/canteen.wxss */
+.tapbtn1{
+    margin-bottom: 20rpx;
+    background-color: #FFFFFF;
+    width:200rpx;
+    height: 60rpx;
+    border-radius: 100rpx;
+    text-align: top;
+    justify-content: center;
+    font-size: 20rpx;
+    
+    
+ }
+ .tapbtn2{
+    margin-bottom: 20rpx;
+    background-color: #FFFFFF;
+    width:200rpx;
+    height: 60rpx;
+    border-radius: 100rpx;
+    text-align: center;
+    justify-content: center;
+    font-size: 20rpx;
+    
+   
+ }
+ .container{
+    display:flex;
+ }
+ .word{
+     display:flexbox;
+     margin-right: 13em;
+ }
+ .divLineX{
+    background: #E4E6ED;
+    width: 100%;
+    height: 1rpx;
+}

src/mdnb.txt

@@ -0,0 +1 @@
+真他妈牛逼