business3

app.json

@@ -1,11 +1,6 @@
 {
   "pages": [
-<<<<<<< HEAD
-    "pages/add/add",
-    "pages/Store-Management/Store-Management",
     "pages/log-on/log-on",
-=======
->>>>>>> cfd0deb4c409b1ec00b3425911667ed03914eb98
     "pages/index/index",
     "pages/logs/logs",
     "pages/me/me",
@@ -14,23 +9,19 @@
     "pages/merManagement/merManagement",
     "pages/bill/bill",
     "pages/order_details/order_details",
-    "pages/order_search/order_search"
+    "pages/order_search/order_search",
+    "pages/add/add",
+    "pages/Store-Management/Store-Management"
+    
   ],
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#fff",
-<<<<<<< HEAD
+
     "navigationBarTitleText": "Weixin",
     "navigationBarTextStyle": "black"
   },
-  "sitemapLocation": "sitemap.json",
-  "usingComponents": {
-    "van-button": "@vant/weapp/button/index"
-  }
-=======
-    "navigationBarTitleText": "商家端",
-    "navigationBarTextStyle": "black"
-  },
+  
   "tabBar": {
     "list": [
       {
@@ -70,6 +61,4 @@
   },
  
   "sitemapLocation": "sitemap.json"
-
->>>>>>> cfd0deb4c409b1ec00b3425911667ed03914eb98
 }

pages/Store-Management/Store-Management.js

@@ -80,5 +80,10 @@ Page({
               items
           })
       }
+  },
+  change:function(){
+    wx.navigateTo({
+      url: '../add/add',
+    })
   }
 })

pages/add/add.wxml

@@ -5,25 +5,29 @@
   <view class="store-pic">
     <text class="store-pic-con">商品图片</text>
     <view class="store-pic-right">
-     <image src="/pages/images/上传图片.svg" mode="" class="store-pic-right-img"/>
-     <text class="store-pic-right-go">上传照片</text>
+      <image src="/pages/images/上传图片.svg" mode="" class="store-pic-right-img" />
+      <text class="store-pic-right-go">上传照片</text>
     </view>
   </view>
   <view class="store-name">
     <text class="store-pic-con">商品名称</text>
     <view class="line"></view>
     <view class="search">
-  <input type="text" placeholder="请输入商品名称（1-10字符）" class="search-text" />
-</view>
-<view class="store-price">
-  <text class="store-pri-con">商品价格</text>
-  <view class="search">
-  <input type="number" placeholder="请输入商品名称（1-10字符）" class="search-pri-text" />
-</view>
-</view>
+      <input type="text" placeholder="请输入商品名称（1-10字符）" class="search-text" />
+    </view>
+    <view class="store-price">
+      <text class="store-pri-con">商品价格</text>
+      <view class="search">
+        <input type="number" placeholder="请输入商品名称（1-10字符）" class="search-pri-text" />
+      </view>
+    </view>
   </view>
   <view class="store-content">
     <text class="store-pri-content">商品内容</text>
-    <input type="text" class="theme-content"/>
+    <input type="text" class="theme-content" />
   </view>
-</view>
+  <view class="btn">
+    <van-button round size="normal" color="#A9A9A9">保存</van-button>
+    <van-button round size="normal" color="#FF8C00">提交</van-button>
+  </view>
+</view>

pages/add/add.wxss

@@ -61,6 +61,7 @@
   background-color: white;
   position: relative;
   top: 2rem;
+  position: relative;
 }
 .line{
   height: 0.1rem;
@@ -124,4 +125,10 @@
   position: relative;
   left: 1rem;
   top: -2.5rem;
+}
+.btn{
+  display: flex;
+  justify-content: space-around;
+  margin-top: 270rpx;
+
 }

pages/log-on/log-on.js

@@ -7,7 +7,11 @@ Page({
   data: {
 
   },
-
+  click:function(){
+    wx.switchTab({
+      url: '../index/index',
+    })
+  },
   /**
    * 生命周期函数--监听页面加载
    */

pages/log-on/log-on.wxml

@@ -10,6 +10,6 @@
 <view class="search">
   <input type="text" placeholder="请输入新密码" type="text" class="search-text"/>
 </view>
-<view class="go">
+<view class="go" bindtap="click">
   登录
 </view>

pages/me/me.wxml

@@ -19,7 +19,7 @@
 
   <view>
     <view style="margin-bottom: 20rpx;">
-      <van-cell is-link icon="/images/shangpin.svg" title-class="title" title="商品管理" link-type="navigateTo" url="/pages/merManagement/merManagement" />
+      <van-cell is-link icon="/images/shangpin.svg" title-class="title" title="商品管理" link-type="navigateTo" url="/pages/Store-Management/Store-Management" />
     </view>
 
     <view style="margin-bottom: 20rpx;">