第一次作业

app.json

@@ -1,5 +1,7 @@
 {
   "pages": [
+    "pages/shop/shop",
+    "pages/login/login",
     "pages/ModifyProduct/ModifyProduct",
     "pages/addProduct/addProduct",
     "pages/index/index",
@@ -15,29 +17,7 @@
     "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",
-  "van-col": "@vant/weapp/col/index",
-  "van-cell": "@vant/weapp/cell/index",
-  "van-cell-group": "@vant/weapp/cell-group/index",
-  "van-tabbar": "@vant/weapp/tabbar/index",
-  "van-tabbar-item": "@vant/weapp/tabbar-item/index",
-  "van-panel": "@vant/weapp/panel/index",
-  "van-divider": "@vant/weapp/divider/index",
-  "van-goods-action": "@vant/weapp/goods-action/index",
-  "van-goods-action-icon": "@vant/weapp/goods-action-icon/index",
-  "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
+    "van-button": "@vant/weapp/button"
   },
   "sitemapLocation": "sitemap.json"
 }

pages/login/login.js

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

pages/login/login.json

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

pages/login/login.wxml

@@ -0,0 +1,14 @@
+<view class="header">
+  <image class="img" src="../img/1.png"></image>
+</view>
+<view class="itemView">
+    <input class="input1" name="userName" placeholder="输入你的账号"
+    bindinput="userNameInput"/>
+  </view>
+<view class="itemView">
+    <input class="input2" password placeholder="输入新的密码"
+     bindinput="passWdInput" />
+  </view>
+  <view class="footer">
+    <button class="btn">登录</button>
+  </view>

pages/login/login.wxss

@@ -0,0 +1,38 @@
+/* pages/login/login.wxss */
+.header{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.img{
+  height: 100px;
+  width: 100px;
+}
+.itemView{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.input1{
+  width: 220px;
+  height: 40px;
+  border: 2px solid rgb(153, 150, 150);
+  margin-bottom: 7px;
+  margin-top: 40px;
+}
+.input2{
+  width: 220px;
+  height: 40px;
+  border: 2px solid rgb(153, 150, 150);
+  margin-bottom: 5px;
+}
+.footer{
+  margin-top: 150px;
+}
+.btn{
+  background: rgb(40, 182, 238);
+  color: white;
+}
+.btn{
+  color: aqua;
+}

pages/shop/shop.js

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

pages/shop/shop.json

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

pages/shop/shop.wxml

@@ -0,0 +1,53 @@
+<!--pages/shop/shop.wxml-->
+
+<!--pages/shop/shop.wxml-->
+<view class="header"></view>
+<vie class="box1">
+  <view class="text-box">
+    <text>店铺图片</text>
+  </view>
+    <vie class="img-box">
+      <image class="img" src="../img/2.jpg"></image>
+    </vie>
+</vie>
+<view class="header"></view>
+<view class="box2">
+  <text class="txt1">店铺名称</text>
+  <text class="txt2">请输入店铺名称</text>
+</view>
+<view class="header"></view>
+<view class="container1">
+    <text class="t1">配送费（￥）</text>
+     <text class="t2">5.00</text>
+</view>
+<view class="header"></view>
+<view class="container1">
+    <text class="t1">配送时长</text>
+     <text class="t3">请输入时长</text>
+</view>
+<view class="header"></view>
+<view class="container1">
+    <text class="t1">包装费（￥）</text>
+     <text class="t4">请输入金额</text>
+</view>
+<view class="header"></view>
+<view class="container1">
+    <text class="t1">营业时间</text>
+     <text class="t5">请输入营业时间</text>
+</view>
+<view class="header"></view>
+<view class="box2">
+  <text class="txt1">客服电话</text>
+  <text class="txt2">请输入客服电话</text>
+</view>
+<view class="header"></view>
+<view class="footer">
+  <text>公告</text>
+  <view class="itemView">
+    <input class="input" password placeholder="请输入"
+     bindinput="text" />
+  </view>
+</view>
+<view class="last-box">
+  <button class="btn">提交</button>
+</view>

pages/shop/shop.wxss

@@ -0,0 +1,86 @@
+/* pages/shop/shop.wxss */
+.header{
+  display: block;
+  background-color: rgb(223, 221, 224);
+  width: 100%;
+  height: 10px;
+}
+.img{
+  width: 20px;
+  height: 20px;
+ }
+.img-box{
+  margin-left: 180px;
+  margin-bottom: 18px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-style: dashed;
+  width: 100px;
+  height: 60px;
+}
+.text-box{
+  display: inline-block;
+  width: 65px;
+  height: 20px;
+  margin-left: 20px;
+}
+.txt1{
+  margin-left: 20px;
+  width: 100%;
+  height: 20px;
+  display: block;
+  margin-top: 5px;
+}
+.txt2{
+  margin-left: 20px;
+  display: block;
+  width: 100%;
+  height: 20px;
+  margin-top: 3px;
+  font-size: 13px;
+  color: rgb(157, 155, 158);
+}
+.container1{
+  margin-top: 5px;
+  margin-bottom: 5px;
+}
+.t1{
+  margin-left: 20px;
+}
+.t2{
+  margin-left: 130px;
+  color: red;
+}
+
+.t3{
+  margin-left: 145px;
+  font-size: 13px;
+  color: rgb(157, 155, 158);
+}
+
+.t4{
+  margin-left: 114px;
+  font-size: 13px;
+  color: rgb(157, 155, 158);
+}
+.t5{
+  margin-left: 114px;
+  font-size: 13px;
+  color: rgb(157, 155, 158);
+}
+.input{
+  width: 220px;
+  height: 70px;
+  border: 2px solid rgb(153, 150, 150);
+  margin-bottom: 20px;
+  margin-left: 50px;
+}
+.btn{
+  margin-top: 10px;
+  background: rgb(40, 182, 238);
+  color: white;
+}
+.last-box{
+  background-color: rgb(223, 221, 224);
+}

project.config.json

@@ -1,43 +1,19 @@
 {
-  "description": "项目配置文件",
+  "appid": "wx34182232f389154d",
+  "compileType": "miniprogram",
+  "libVersion": "2.31.0",
   "packOptions": {
     "ignore": [],
     "include": []
   },
   "setting": {
-    "bundle": false,
-    "userConfirmedBundleSwitch": false,
-    "urlCheck": true,
-    "scopeDataCheck": false,
     "coverView": true,
     "es6": true,
     "postcss": true,
-    "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
-    "preloadBackgroundData": false,
     "minified": true,
-    "autoAudits": false,
-    "newFeature": false,
-    "uglifyFileName": false,
-    "uploadWithSourceMap": true,
-    "useIsolateContext": true,
-    "nodeModules": false,
     "enhance": true,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
     "showShadowRootInWxmlPanel": true,
-    "packNpmManually": true,
-    "enableEngineNative": false,
-    "packNpmRelationList": [
-      {
-        "packageJsonPath": "./package.json",
-        "miniprogramNpmDistDir": "./miniprogram/"
-      }
-    ],
-    "minifyWXSS": true,
-    "showES6CompileOption": false,
-    "minifyWXML": true,
+    "packNpmRelationList": [],
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],
@@ -45,14 +21,6 @@
     },
     "condition": false
   },
-  "compileType": "miniprogram",
-  "libVersion": "2.19.4",
-<<<<<<< HEAD
-  "appid": "wxa4d74978f7ec4e2d",
-=======
-  "appid": "wxa0f0dd7a331e2d3f",
->>>>>>> e381d23c13a633326fbf79f4eefcf2ce78db8543
-  "projectname": "miniprogram-92",
   "condition": {},
   "editorSetting": {
     "tabIndent": "insertSpaces",

project.private.config.json

@@ -3,21 +3,5 @@
   "projectname": "delivery-business",
   "setting": {
     "compileHotReLoad": true
-<<<<<<< HEAD
-=======
-  },
-  "condition": {
-    "miniprogram": {
-      "list": [
-        {
-          "name": "页面",
-          "pathName": "pages/ccc/cbc",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        }
-      ]
-    }
->>>>>>> e381d23c13a633326fbf79f4eefcf2ce78db8543
   }
 }