app.json

@@ -1,6 +1,5 @@
 {
   "pages": [
-    "pages/change/change",
     "pages/log-on/log-on",
     "pages/index/index",
     "pages/logs/logs",
@@ -12,12 +11,14 @@
     "pages/order_details/order_details",
     "pages/order_search/order_search",
     "pages/add/add",
-    "pages/Store-Management/Store-Management"
+    "pages/Store-Management/Store-Management",
+    "pages/change/change"
   ],
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "Weixin",
+
+    "navigationBarTitleText": "商家端",
     "navigationBarTextStyle": "black"
   },
   "tabBar": {
@@ -55,7 +56,8 @@
     "van-checkbox-group": "@vant/weapp/checkbox-group/index",
     "van-submit-bar": "@vant/weapp/submit-bar/index",
     "van-icon": "@vant/weapp/icon/index",
-    "van-calendar": "@vant/weapp/calendar/index"
+    "van-calendar": "@vant/weapp/calendar/index",
+    "van-uploader": "@vant/weapp/uploader/index"
   },
   "sitemapLocation": "sitemap.json"
 }

node_modules/.package-lock.json

@@ -6,21 +6,18 @@
   "packages": {
     "node_modules/@vant/weapp": {
       "version": "1.10.16",
-      "resolved": "https://registry.npmmirror.com/@vant/weapp/-/weapp-1.10.16.tgz",
-      "integrity": "sha512-6ewSFv0w4ckKyuimn/tSdSVdDg5IgontD6/g19w+kshm2x39aajWqxSs3HjW2+Cde+NG2ri949R+00+NFcVHPw=="
+      "dev": true,
+      "license": "MIT"
     },
-<<<<<<< HEAD
     "node_modules/miniprogram-api-typings": {
       "version": "3.9.1",
-      "resolved": "https://registry.npmmirror.com/miniprogram-api-typings/-/miniprogram-api-typings-3.9.1.tgz",
-      "integrity": "sha512-oyratzOWyuFhBzONp06l0FBPu03ltCd1sRWoy2v38SnAKxtpZ8ySLTSEw//hIsBdocMda7fFZEjOG57L57mcUw==",
-      "dev": true
-=======
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/vant-weapp": {
       "version": "0.5.29",
-      "resolved": "https://registry.npmjs.org/vant-weapp/-/vant-weapp-0.5.29.tgz",
-      "integrity": "sha512-RMc0Ga914XFwspw2WuOMU8bOHlIkua8X1DoQ/KPnGQzjwT1uEL4S7W186EmaHF1wN2krB9BVd0LdRRt39dGh6Q=="
->>>>>>> cfd0deb4c409b1ec00b3425911667ed03914eb98
+      "dev": true,
+      "license": "MIT"
     }
   }
 }

package-lock.json

@@ -8,55 +8,40 @@
       "name": "delivery-business",
       "version": "1.0.0",
       "license": "ISC",
-      "dependencies": {
-<<<<<<< HEAD
-        "@vant/weapp": "^1.10.16"
-      },
       "devDependencies": {
-        "miniprogram-api-typings": "^3.9.1"
-=======
         "@vant/weapp": "^1.10.16",
+        "miniprogram-api-typings": "^3.9.1",
         "vant-weapp": "^0.5.29"
->>>>>>> cfd0deb4c409b1ec00b3425911667ed03914eb98
       }
     },
     "node_modules/@vant/weapp": {
       "version": "1.10.16",
-      "resolved": "https://registry.npmmirror.com/@vant/weapp/-/weapp-1.10.16.tgz",
-      "integrity": "sha512-6ewSFv0w4ckKyuimn/tSdSVdDg5IgontD6/g19w+kshm2x39aajWqxSs3HjW2+Cde+NG2ri949R+00+NFcVHPw=="
+      "dev": true,
+      "license": "MIT"
     },
-<<<<<<< HEAD
     "node_modules/miniprogram-api-typings": {
       "version": "3.9.1",
-      "resolved": "https://registry.npmmirror.com/miniprogram-api-typings/-/miniprogram-api-typings-3.9.1.tgz",
-      "integrity": "sha512-oyratzOWyuFhBzONp06l0FBPu03ltCd1sRWoy2v38SnAKxtpZ8ySLTSEw//hIsBdocMda7fFZEjOG57L57mcUw==",
-      "dev": true
-=======
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/vant-weapp": {
       "version": "0.5.29",
-      "resolved": "https://registry.npmjs.org/vant-weapp/-/vant-weapp-0.5.29.tgz",
-      "integrity": "sha512-RMc0Ga914XFwspw2WuOMU8bOHlIkua8X1DoQ/KPnGQzjwT1uEL4S7W186EmaHF1wN2krB9BVd0LdRRt39dGh6Q=="
->>>>>>> cfd0deb4c409b1ec00b3425911667ed03914eb98
+      "dev": true,
+      "license": "MIT"
     }
   },
   "dependencies": {
     "@vant/weapp": {
       "version": "1.10.16",
-      "resolved": "https://registry.npmmirror.com/@vant/weapp/-/weapp-1.10.16.tgz",
-      "integrity": "sha512-6ewSFv0w4ckKyuimn/tSdSVdDg5IgontD6/g19w+kshm2x39aajWqxSs3HjW2+Cde+NG2ri949R+00+NFcVHPw=="
+      "dev": true
     },
-<<<<<<< HEAD
     "miniprogram-api-typings": {
       "version": "3.9.1",
-      "resolved": "https://registry.npmmirror.com/miniprogram-api-typings/-/miniprogram-api-typings-3.9.1.tgz",
-      "integrity": "sha512-oyratzOWyuFhBzONp06l0FBPu03ltCd1sRWoy2v38SnAKxtpZ8ySLTSEw//hIsBdocMda7fFZEjOG57L57mcUw==",
       "dev": true
-=======
+    },
     "vant-weapp": {
       "version": "0.5.29",
-      "resolved": "https://registry.npmjs.org/vant-weapp/-/vant-weapp-0.5.29.tgz",
-      "integrity": "sha512-RMc0Ga914XFwspw2WuOMU8bOHlIkua8X1DoQ/KPnGQzjwT1uEL4S7W186EmaHF1wN2krB9BVd0LdRRt39dGh6Q=="
->>>>>>> cfd0deb4c409b1ec00b3425911667ed03914eb98
+      "dev": true
     }
   }
 }

package.json

@@ -12,15 +12,9 @@
   },
   "author": "",
   "license": "ISC",
-  "dependencies": {
-<<<<<<< HEAD
-    "@vant/weapp": "^1.10.16"
-  },
   "devDependencies": {
-    "miniprogram-api-typings": "^3.9.1"
-=======
+    "miniprogram-api-typings": "^3.9.1",
     "@vant/weapp": "^1.10.16",
     "vant-weapp": "^0.5.29"
->>>>>>> cfd0deb4c409b1ec00b3425911667ed03914eb98
   }
 }

pages/Store-Management/Store-Management.js

@@ -2,6 +2,8 @@
 Page({
   data: {
       checkedAll: "",
+      checkclo:'true',
+      e:'red',
       items: [{
               value: 'OLD',
               name: '老式麻辣烫（微辣）',
@@ -10,8 +12,9 @@ Page({
               origin:'￥15.9',
               card:'20',
               content:'内容',
-              checked: 'true'
-              
+              checked: 'true',
+              id:0,
+              checkclo1:'false'
           },
           {
             value: 'old',
@@ -20,7 +23,9 @@ Page({
             card:'20',
             origin:'￥15.9',
             content:'内容',
-            price:'￥9.9'
+            price:'￥9.9',
+            id:1,
+            checkclo1:'false'
           },
           {
             value: 'Old',
@@ -29,10 +34,39 @@ Page({
             card:'20',
             origin:'￥15.9',
             content:'内容',
-            price:'￥9.9'
+            price:'￥9.9',
+            id:2,
+            checkclo1:'false'
           },
       ]
   },
+
+  acceptMission: function (e) {
+    // 获取当前点击下标    
+    var Index = e.currentTarget.dataset.index;
+    console.log(Index);
+    // data中获取列表   
+    var Arr = this.data.items;
+    for (let i in Arr) {
+      //遍历列表数据      
+      if (i == Index) {
+        if(Arr[i].id==Index){
+          // !this.data.items.checkclo1,
+          !Arr.checkclo1
+        }
+        // !Arr.checkclo1
+       
+      }
+      //数组重新赋值
+      let completeStatus = `items[${Index}].checkclo1`
+      this.setData({
+        [completeStatus]: !this.data.items[Index].checkclo1
+      })
+    }
+  },
+ 
+    
+  
   return(event){
     wx.switchTab({
       url: '/pages/me/me',
@@ -41,6 +75,7 @@ Page({
       complete: ()=>{},//无论成功还是失败都会执行
   })
 },
+
   checkboxChange(e) {
       // console.log('checkbox发生change事件，携带value值为：', e.detail.value)
       const items = this.data.items
@@ -89,9 +124,22 @@ Page({
           })
       }
   },
-  change:function(){
+  switch1Change(event){
+    // const checkclo = JSON.stringify(event.detail.value);
+    const checkclo = event.detail.value;
+    this.setData({checkclo})
+    // console.log(checkclo)
+    // console.log(event)
+  },
+  add:function(){
     wx.navigateTo({
       url: '../add/add',
     })
+  },
+  change:function(){
+    wx.navigateTo({
+      url: '../change/change',
+    })
   }
+
 })

pages/Store-Management/Store-Management.wxml

@@ -1,7 +1,7 @@
 <view class="top">
   <image src="/images/返回.png" mode="" class="return" bindtap="return" />
   <text class="top-title">商品管理</text>
-  <view class="top-button" bindtap="change">+ 添加商品</view>
+  <view class="top-button" bindtap="add">+ 添加商品</view>
 </view>
 
 <!-- 自定义导航栏 -->
@@ -26,27 +26,33 @@
         </view>
         <view class="weui-cells weui-cells_after-title">
           <checkbox-group bindchange="checkboxChange" class="checkbox">
-              <label class="weui-cell weui-check__label" wx:for="{{items}}" wx:key="{{item.value}}">
-                <view class="weui-cell__hd">
-                  <checkbox value="{{item.value}}" checked="{{item.checked}}" class="change" />
-                  <text class="weui-cell__bd">{{item.name}}</text>
-                  <text class="state">{{item.state}}</text>
-                  <view class="xian"></view>
-                  <view class="fa">
-                    <view class="gray"></view>
-                    <text class="price">价格：{{item.price}}</text>
-                    <switch checked bindchange="switch1Change" color="green" class="chance" />
-                    <text class="clect-2">下架</text>
-                    <text class="clect">上架\</text>
-                    <text class="card">原价：{{item.origin}}</text>
-                    <text class="fa-change">修改</text>
-                    <text class="card">积分：{{item.card}}</text>
-                    <text class="fa-change">删除</text>
-                    <text class="card">内容：{{item.content}}</text>
-                    <view class="kong"></view>
-                  </view>
+            <label class="weui-cell weui-check__label" data-id="{{item.id}}" wx:for="{{items}}" wx:key="value">
+              <view class="weui-cell__hd">
+                <checkbox value="{{item.value}}" checked="{{item.checked}}" class="change" />
+                <text class="weui-cell__bd">{{item.name}}</text>
+                <text class="state" wx:if="{{item.state == '活动中'}}">{{item.state}}</text>
+                <text class="state1" wx:if="{{item.state == '审核中'}}">{{item.state}}</text>
+                <text class="state2" wx:if="{{item.state == '申请活动'}}">{{item.state}}</text>
+                <view class="xian"></view>
+                <view class="fa">
+                  <view class="gray"></view>
+                  <text class="price">价格：{{item.price}}</text>
+                  <switch catchtap="acceptMission" data-index="{{index}}" checked bindchange="switch1Change" color="green" class="chance" />
+                  <text wx:if="{{!item.checkclo1}}" class="clt clect-2">下架</text>
+                  <text wx:if="{{item.checkclo1}}" class="clt2 clect-2">下架</text>
+                  <text wx:if="{{item.checkclo1}}" class="clt clect">上架\</text>
+                  <text wx:if="{{!item.checkclo1}}" class="clt2 clect">上架\</text>
+                  <text class="card">原价：{{item.origin}}</text>
+                  <!-- <text class="fa-change" bindtap="change">修改</text> -->
+                  <cover-view class="fa-change" catchtap='change'>修改
+                  </cover-view>
+                  <text class="card">积分：{{item.card}}</text>
+                  <text class="fa-change">删除</text>
+                  <text class="card">内容：{{item.content}}</text>
+                  <view class="kong"></view>
                 </view>
-              </label>
+              </view>
+            </label>
           </checkbox-group>
         </view>
       </view>

pages/Store-Management/Store-Management.wxss

@@ -202,15 +202,47 @@ radio .wx-radio-input.wx-radio-input-checked::before {
 .state{
   background-color: orange;
   display: inline-block;
-  width: 4.5rem;
-  height: 1.5rem;
+  width: 5rem;
+  height: 1.3rem;
   float: right;
-  border-radius: 0.6rem;
+  border-radius: 0.8rem;
   color: white;
   font-size:small;
-  line-height: 1.5rem;
+  line-height: 1.3rem;
   text-align: center;
   margin-top: 0.5rem;
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px
+}
+.state1{
+  background-color: pink;
+  display: inline-block;
+  width: 5rem;
+  height: 1.3rem;
+  float: right;
+  border-radius: 0.8rem;
+  color: white;
+  font-size:small;
+  line-height: 1.3rem;
+  text-align: center;
+  margin-top: 0.5rem;
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px
+}
+.state2{
+  background-color: green;
+  display: inline-block;
+  width: 5rem;
+  height: 1.3rem;
+  float: right;
+  border-radius: 0.8rem;
+  color: white;
+  font-size:small;
+  line-height: 1.3rem;
+  text-align: center;
+  margin-top: 0.5rem;
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px
 }
 .fa{
   float: left;
@@ -223,6 +255,18 @@ radio .wx-radio-input.wx-radio-input-checked::before {
   display: inline-block;
   font-size: small;
 }
+.price{
+  color: rgb(97, 96, 96);
+  float: left;
+  display: inline-block;
+  font-size: small;
+}
+.price{
+  color: rgb(97, 96, 96);
+  float: left;
+  display: inline-block;
+  font-size: small;
+}
 .card{
   color: rgb(97, 96, 96);
   float: left;
@@ -268,9 +312,11 @@ radio .wx-radio-input.wx-radio-input-checked::before {
 .clect{
   font-size: small;
   float: right;
-  color: rgb(1, 107, 1);
   margin-top: 0.1rem;
 }
+.clt{
+  color: green!important;
+}
 .clect-2{
   font-size: small;
   color: #858383;
@@ -278,6 +324,12 @@ radio .wx-radio-input.wx-radio-input-checked::before {
   float: right;
   margin-top: 0.1rem;
 }
+.clt2{
+  color: #858383!important;
+}
+.red{
+  color: aqua;
+}
 .fa-change{
   background: #9c9b9b;
   display: inline-block;
@@ -292,3 +344,9 @@ radio .wx-radio-input.wx-radio-input-checked::before {
   float: right;
   margin-top: 0.4rem;
 }
+.pink{
+  background-color:pink;
+}
+.green{
+  background-color:green;
+}

pages/add/add.js

@@ -7,7 +7,15 @@ Page({
   data: {
 
   },
-
+  return(event){
+    wx.navigateBack({
+      // url: '/pages/Store-Management/Store-Management',
+      url:1,
+      success: (result)=>{},//成功回调
+      fail: ()=>{},//失败回调
+      complete: ()=>{},//无论成功还是失败都会执行
+  })
+},
   /**
    * 生命周期函数--监听页面加载
    */

pages/add/add.wxml

@@ -1,4 +1,5 @@
 <view class="top">
+  <image src="/images/返回.png" mode="" class="return" bindtap="return" />
   <text class="top-title">商品管理</text>
 </view>
 <view class="main">
@@ -6,6 +7,7 @@
     <text class="store-pic-con">商品图片</text>
     <view class="store-pic-right">
       <image src="/images/上传图片.svg" mode="" class="store-pic-right-img" />
+      <!-- <image src="/images/上传图片.svg" mode="" class="store-pic-right-img" /> -->
       <text class="store-pic-right-go">上传照片</text>
     </view>
   </view>

pages/add/add.wxss

@@ -8,8 +8,8 @@
 .top-title{
  line-height: 1.75rem;
  box-sizing: border-box;
- margin-left: 9.5rem;
- float: left;
+ margin-left: 7.3rem;
+ /* float: left; */
  font-weight: 600;
  color: #333333;
  font-size: large;
@@ -130,4 +130,10 @@
   display: flex;
   justify-content: space-around;
   margin-top: 270rpx;
+}
+.return{
+  width: 1.4rem;
+  height: 1.4rem;
+  margin-left: 1rem;
+  float: left;
 }

pages/home/home.js

@@ -1,4 +1,4 @@
-// home/home.js
+// pages/home/home.js
 Page({
 
   /**

pages/home/home.json

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

pages/home/home.wxml

@@ -1,2 +1,2 @@
-<!--home/home.wxml-->
-<text>home/home.wxml</text>
+<!--pages/home/home.wxml-->
+<text>pages/home/home.wxml</text>

pages/home/home.wxss

@@ -1 +0,0 @@
-/* home/home.wxss */

pages/index/index.wxml

@@ -40,7 +40,7 @@
     </view>
     <view class="card1">
       <text style="font-size:12px;">下单时间：2023-04-24 17：38：34</text>
-      <van-button color="#FF8C00" custom-style="border-radius:8px" class="btn1" round type="info" size="mini">重新打印</van-button>
+      <van-button color="#FF8C00" custom-style="border-radius:8px" class="btn1" round type="info" size="mini">确认送达</van-button>
     </view>
   </view>
 </template>

pages/merManagement/merManagement.js

@@ -1,25 +1,18 @@
-// merManagement/merManagement.js
+// pages/merManagement/merManagement.js
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    checked: true,
-    activeIcon: '/images/xuanze.svg',
-    inactiveIcon: '/images/xuanzeanniu.svg',
-  },
-  onChange(event) {
-    this.setData({
-      checked: event.detail,
-    });
+
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    
+
   },
 
   /**

pages/merManagement/merManagement.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "navigationBarTitleText": "商品管理"
-}

pages/merManagement/merManagement.wxml

@@ -1,20 +1,2 @@
-<view style="width: 100wh; height: 100vh; background-color: #DCDCDC;">
-  <van-divider />
-  <view class="ert">
-    <van-search value="{{ value }}" placeholder="请输入搜索关键词" shape="round" />
-    <van-button color="#FF8C00" class="btn" round type="info" size="mini">搜索</van-button>
-  </view>
-  <view class="checks">
-    <van-checkbox label-class="lable" style="font-size: 26rpx;" use-icon-slot value="{{ checked }}" bind:change="onChange">
-      全选
-      <image style="width: 40rpx;height: 40rpx;" slot="icon" src="{{ checked ? activeIcon : inactiveIcon }}" />
-      <view class="btn1">
-        <van-button plain class="cst" color="#32CD32" style="margin-left:30rpx;" hairline round size="mini">一键上架</van-button>
-        <van-button style="margin-left:30rpx;" color="#7232dd" round size="mini">一键下架</van-button>
-        <van-button style="margin-left:30rpx;" color="#7232dd" round size="mini">删除</van-button>
-      </view>
-    </van-checkbox>
-
-
-  </view>
-</view>
+<!--pages/merManagement/merManagement.wxml-->
+<text>pages/merManagement/merManagement.wxml</text>

pages/merManagement/merManagement.wxss

@@ -1,34 +0,0 @@
-/* merManagement/merManagement.wxss */
-.ert{
-  position: relative;
-  margin-top: -32rpx;
-}
-.btn{
-  position: absolute;
-  right: 40rpx;
-  top: 32rpx;
-}
-.lable{
-  margin-top: -10rpx;
-  margin-left: -10rpx;
-}
-.checks{
-  margin: 20rpx 0 20rpx 30rpx;
-  display: flex;
-  position: relative;
-}
-.btn1{
-  position: absolute;
-  right: 40rpx;
-  top: 0rpx;
-}
-.cst{
-  /* background-color: #DCDCDC; */
-background: transparent;   /*设置背景颜色一致*/
-border-color: transparent; /*设置边框颜色一致*/
-}
-button[plain] {
-  /* border: none; */
-  background-color:#DCDCDC ;
-  border-color: transparent;
-}