app.json

@@ -1,19 +1,27 @@
 {
-  "pages":[
+  "pages": [
+    "pages/ModifyProduct/ModifyProduct",
+    "pages/addProduct/addProduct",
     "pages/index/index",
     "pages/logs/logs",
     "pages/aaa/abc",
     "pages/bbb/bbc",
     "pages/ccc/cbc"
   ],
-  "window":{
-    "backgroundTextStyle":"light",
+  "window": {
+    "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#fff",
     "navigationBarTitleText": "Weixin",
-    "navigationBarTextStyle":"black"
+    "navigationBarTextStyle": "black"
   },
   "usingComponents": {
     "van-button": "@vant/weapp/button",
+<<<<<<< HEAD
+    "van-card": "@vant/weapp/card/index",
+    "van-image": "@vant/weapp/image/index",
+    "van-row": "@vant/weapp/row/index",
+    "van-col": "@vant/weapp/col/index"
+=======
     "van-empty": "@vant/weapp/empty/index",
     "van-icon": "@vant/weapp/icon/index",
     "van-row": "@vant/weapp/row/index",
@@ -29,7 +37,7 @@
   "van-goods-action-button": "@vant/weapp/goods-action-button/index",
   "van-card": "@vant/weapp/card/index",
   "van-swipe-cell": "@vant/weapp/swipe-cell/index"
+>>>>>>> e381d23c13a633326fbf79f4eefcf2ce78db8543
   },
-  
   "sitemapLocation": "sitemap.json"
-}
+}

pages/ModifyProduct/ModifyProduct.js

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

pages/ModifyProduct/ModifyProduct.json

@@ -0,0 +1,9 @@
+{
+  "usingComponents": {
+    "van-card": "@vant/weapp/card/index",
+    "van-image": "@vant/weapp/image/index",
+    "van-row": "@vant/weapp/row/index",
+    "van-col": "@vant/weapp/col/index"
+  },
+  "navigationBarTitleText":"修改商品"
+}

pages/ModifyProduct/ModifyProduct.wxml

@@ -0,0 +1,31 @@
+<!--index.wxml-->
+<view class="page">
+  <view class="card card_img">
+    <view class="tit">商品图片</view>
+    <image src="./spicyFood.png" class="food_img" mode="" />
+  </view>
+
+  <view class="card">
+    <view class="tit">商品名称</view>
+    <view class="line"></view>
+    <view class="desc">
+      麻辣烫重辣重麻
+    </view>
+  </view>
+
+  <view class="card_price">
+    <view class="tit">商品价格</view>
+    <view class="price">￥5.00</view>
+  </view>
+
+  <view class="card">
+    <view class="tit">商品内容</view>
+    <view class="line"></view>
+    <textarea value="麻辣烫中麻中辣"></textarea>
+  </view>
+
+  <view class="btn_wrap">
+    <view class="btn">保存</view>
+    <view class="btn btn2">提交</view>
+  </view>
+</view>

pages/ModifyProduct/ModifyProduct.wxss

@@ -0,0 +1,76 @@
+/* pages/addProduct/addProduct.wxss */
+/**index.wxss**/
+.page{
+  background: #eee;
+  padding: 10px 0;
+}
+
+.card{
+  background: #fff;
+  padding: 15px;
+  margin-bottom: 10px;
+}
+.card_img{
+  display: flex;
+  justify-content: space-between;
+}
+
+.food_img{
+  width: 280px;
+  height: 100px;
+}
+
+.card .tit{
+  width: 100%;
+}
+.card .line{
+  width: 100%;
+  height: 1px;
+  background: #eee;
+  margin: 10px 0;
+}
+
+.desc{
+  color: #666;
+  font-size: 14px;
+}
+
+.card_price{
+  display: flex;
+  background: #fff;
+  padding: 15px;
+  margin-bottom: 10px;
+  justify-content: space-between;
+}
+.price{
+  color: red;
+}
+
+textarea{
+  border: 1px solid #ccc;
+  border-radius: 5px;
+  padding: 5px;
+  box-sizing: border-box;
+  width: 99%;
+  color: #666;
+  font-size: 14px;
+}
+
+.btn_wrap{
+  padding: 15px;
+  display: flex;
+  justify-content: space-between;
+}
+.btn{
+  width: 48%;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  background-color: #afafaf;
+  color: #fff;
+  border-radius: 30px;
+}
+
+.btn2{
+  background-color: #ff8e0a;
+}

pages/addProduct/addProduct.js

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

pages/addProduct/addProduct.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText":"添加商品"
+}

pages/addProduct/addProduct.wxml

@@ -0,0 +1,31 @@
+<!--index.wxml-->
+<view class="page">
+  <view class="card card_img">
+    <view class="tit">商品图片</view>
+    <image src="./add.jpg" class="food_img" mode="" />
+  </view>
+
+  <view class="card">
+    <view class="tit">商品名称</view>
+    <view class="line"></view>
+    <view class="desc">
+      请输入商品名称（1-10字符）
+    </view>
+  </view>
+
+  <view class="card_price">
+    <view class="tit">商品价格</view>
+    <view class="price">请输入商品价格</view>
+  </view>
+
+  <view class="card">
+    <view class="tit">商品内容</view>
+    <view class="line"></view>
+    <textarea value="麻辣烫中麻中辣"></textarea>
+  </view>
+
+  <view class="btn_wrap">
+    <view class="btn">保存</view>
+    <view class="btn btn2">提交</view>
+  </view>
+</view>

pages/addProduct/addProduct.wxss

@@ -0,0 +1,77 @@
+/* pages/addProduct/addProduct.wxss */
+/**index.wxss**/
+.page{
+  background: #eee;
+  padding: 10px 0;
+}
+
+.card{
+  background: #fff;
+  padding: 15px;
+  margin-bottom: 10px;
+}
+.card_img{
+  display: flex;
+  justify-content: space-between;
+}
+
+.food_img{
+  width: 280px;
+  height: 100px;
+}
+
+.card .tit{
+  width: 100%;
+}
+.card .line{
+  width: 100%;
+  height: 1px;
+  background: #eee;
+  margin: 10px 0;
+}
+
+.desc{
+  color: #666;
+  font-size: 14px;
+}
+
+.card_price{
+  display: flex;
+  background: #fff;
+  padding: 15px;
+  margin-bottom: 10px;
+  justify-content: space-between;
+}
+.price{
+  color: #666;
+  font-size: 14px;
+}
+
+textarea{
+  border: 1px solid #ccc;
+  border-radius: 5px;
+  padding: 5px;
+  box-sizing: border-box;
+  width: 99%;
+  color: #666;
+  font-size: 14px;
+}
+
+.btn_wrap{
+  padding: 15px;
+  display: flex;
+  justify-content: space-between;
+}
+.btn{
+  width: 48%;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  background-color: #afafaf;
+  color: #fff;
+  border-radius: 30px;
+}
+
+.btn2{
+  background-color: #ff8e0a;
+}

pages/index/index.wxml

@@ -21,5 +21,10 @@
     <text class="user-motto">{{motto}}</text>
   </view>
   <van-button type="primary">按钮</van-button>
+  <van-button type="default">默认按钮</van-button>
+  <van-button type="primary">主要按钮</van-button>
+  <van-button type="info">信息按钮</van-button>
+  <van-button type="warning">警告按钮</van-button>
+  <van-button type="danger">危险按钮</van-button>
 
-</view>
+</view>

project.config.json

@@ -47,7 +47,11 @@
   },
   "compileType": "miniprogram",
   "libVersion": "2.19.4",
+<<<<<<< HEAD
+  "appid": "wxa4d74978f7ec4e2d",
+=======
   "appid": "wxa0f0dd7a331e2d3f",
+>>>>>>> e381d23c13a633326fbf79f4eefcf2ce78db8543
   "projectname": "miniprogram-92",
   "condition": {},
   "editorSetting": {

project.private.config.json

@@ -3,6 +3,8 @@
   "projectname": "delivery-business",
   "setting": {
     "compileHotReLoad": true
+<<<<<<< HEAD
+=======
   },
   "condition": {
     "miniprogram": {
@@ -16,5 +18,6 @@
         }
       ]
     }
+>>>>>>> e381d23c13a633326fbf79f4eefcf2ce78db8543
   }
 }