xiugai

app.json

@@ -1,10 +1,10 @@
 {
-<<<<<<< HEAD
   "pages": [
     "pages/index/index",
     "pages/logs/logs",
     "pages/billing_Statistics/index",
-    "pages/store_Management/index"
+    "pages/store_Management/index",
+    "pages/increase/increase"
   ],
   "window": {
     "backgroundTextStyle": "light",
@@ -13,25 +13,9 @@
     "navigationBarTextStyle": "black"
   },
   "usingComponents": {
-    "van-button": "@vant/weapp/button"
+    "van-button": "@vant/weapp/button",
+    "van-field": "@vant/weapp/field/index",
+    "van-uploader": "@vant/weapp/uploader/index"
   },
   "sitemapLocation": "sitemap.json"
-}
-=======
-  "pages":[
-    "pages/index/index",
-    "pages/logs/logs"
-  ],
-  "window":{
-    "backgroundTextStyle":"light",
-    "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "Weixin",
-    "navigationBarTextStyle":"black"
-  },
-  "usingComponents": {
-    "van-button":"@vant/weapp/button"
-  },
-
-  "sitemapLocation": "sitemap.json"
-}
->>>>>>> 2e65b556490cfe24940c679f526c85a7b019b6c7
+}

pages/increase/increase.js

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

pages/increase/increase.json

@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "van-button": "@vant/weapp/button",
+    "van-uploader": "@vant/weapp/uploader/index",
+    "van-field": "@vant/weapp/field/index"
+  }
+}

pages/increase/increase.wxml

@@ -0,0 +1,34 @@
+<!--pages/increase/increase.wxml-->
+<view class="product">
+  <text class="picture"> 商品图片</text>
+  <van-uploader file-list="{{ fileList }}" bind:after-read="afterRead" style="padding-left: 260px;"/>
+</view>
+
+<view class="topic">
+  <text class="topic-1">商品名称</text>
+</view>
+<view class="topic-2">
+  <view>
+    <input class="appi" maxlength="10" placeholder="请输入商品名称（1-10个字符）" />
+  </view>
+</view>
+
+<view class="topic">
+  <van-cell-group>
+  <van-field
+    value="{{ username3 }}"
+    label="商品价格"
+    placeholder="请输入商品价格"
+    input-align="right"
+  />
+</van-cell-group>
+</view>
+
+<view class="topic-4">
+  <text>商品内容</text>
+  <textarea class="area" name="" id="" cols="30" rows="10" maxlength="15"></textarea>
+</view>
+<view class="but">
+  <button class="but-1" style="width:40vw">保存</button>
+  <button class="but-2" style="width:40vw">提交</button>
+</view>

pages/increase/increase.wxss

@@ -0,0 +1,76 @@
+/* pages/increase/increase.wxss */
+page{
+  background-color: rgba(232, 233, 240, 0.986);
+}
+
+.product {
+  background-color:white;
+  margin-top: 5%;
+  width: 100%;
+  height: 130px;
+}
+
+.picture {
+  padding-left: 15px;
+  position:absolute;
+  top: 4%;
+}
+
+.topic-1 {
+  padding-left: 15px;
+}
+
+.topic {
+  background-color: white;
+  margin-top: 5%;
+  width: 100%;
+  height: 45px;
+}
+
+.topic-2 {
+  border-top: 1px solid black;
+  background-color: white;
+  width: 100%;
+  height: 45px;
+  padding-left: 15px;
+
+}
+
+.topic-3 {
+  line-height: 42px;
+  padding-left: 15px;
+}
+
+
+.topic-4 {
+  background-color:white;
+  margin-top: 5%;
+  width: 100%;
+  height: 130px;
+  padding-left: 15px;
+}
+
+.area {
+  margin-top: 3%;
+  border: 1px solid rgb(211, 196, 196);
+  border-radius: 5px;
+  width: 90%;
+  height: 60%;
+}
+
+.but {
+  margin-top: 10%;
+  display: flex;
+}
+
+.but-1 {
+  color: aliceblue;
+  background-color: gray;
+  border-radius: 30px;
+}
+
+.but-2 {
+  color: aliceblue;
+  background-color: darkorange;
+  border-radius: 30px;
+}

pages/index/index.wxml

@@ -24,9 +24,6 @@
   </view>
   <van-button type="primary">按钮</van-button>
 </view>
-<<<<<<< HEAD
 <!-- 两端对齐 -->
 
 
-=======
->>>>>>> 2e65b556490cfe24940c679f526c85a7b019b6c7

project.private.config.json

@@ -1,61 +1,20 @@
 {
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-<<<<<<< HEAD
-  "projectname": "delivery-rider",
+  "projectname": "miniprogram-92",
   "setting": {
     "compileHotReLoad": true
   },
-  "libVersion": "2.19.6",
   "condition": {
     "miniprogram": {
       "list": [
         {
           "name": "",
-          "pathName": "pages/index/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null,
-          "partialCompile": {
-            "enabled": false,
-            "pages": [
-              "pages/billing_Statistics/index"
-            ]
-          }
-        },
-        {
-          "name": "账单统计",
           "pathName": "pages/billing_Statistics/index",
           "query": "",
           "launchMode": "default",
-          "scene": null,
-          "partialCompile": {
-            "enabled": false,
-            "pages": [
-              "pages/billing_Statistics/index"
-            ]
-          }
-        },
-        {
-          "name": "店铺管理",
-          "pathName": "pages/store_Management/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null,
-          "partialCompile": {
-            "enabled": false,
-            "pages": [
-              "pages/store_Management/index"
-            ]
-          }
+          "scene": null
         }
       ]
     }
   }
-=======
-  "projectname": "miniprogram",
-  "setting": {
-    "compileHotReLoad": true
-  },
-  "libVersion": "2.19.6"
->>>>>>> 2e65b556490cfe24940c679f526c85a7b019b6c7
 }