order

.gitignore

@@ -0,0 +1,23 @@
+.DS_Store
+node_modules/
+dist/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+**/*.log
+
+tests/**/coverage/
+tests/e2e/reports
+selenium-debug.log
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.local
+
+package-lock.json
+yarn.lock

app.json

@@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
   "pages":[
     "pages/index/index",
     "pages/logs/logs"
@@ -19,3 +20,36 @@
 
   
 }
+=======
+  "pages": [
+    "pages/index/index",
+    "pages/logs/logs",
+    "pages/billing_Statistics/index",
+    "pages/store_Management/index",
+    "pages/increase/increase",
+    "pages/details/orderDetails",
+    "pages/search/search",
+    "pages/message/message",
+    "pages/login/login"
+  ],
+  "window": {
+    "backgroundTextStyle": "light",
+    "navigationBarBackgroundColor": "#fff",
+    "navigationBarTitleText": "商家端",
+    "navigationBarTextStyle": "black"
+  },
+  "usingComponents": {
+    "van-button": "@vant/weapp/button",
+    "van-field": "@vant/weapp/field/index",
+    "van-uploader": "@vant/weapp/uploader/index",
+    "van-search": "@vant/weapp/search/index",
+    "van-row": "@vant/weapp/row/index",
+    "van-col": "@vant/weapp/col/index",
+    "van-panel": "@vant/weapp/panel/index",
+    "van-cell": "@vant/weapp/cell/index",
+    "van-cell-group": "@vant/weapp/cell-group/index",
+    "van-image": "@vant/weapp/image/index"
+  },
+  "sitemapLocation": "sitemap.json"
+}
+>>>>>>> 433a4c6b7ddd90c2c9e3d215e91e2fbfafb60b2c

app1.json

@@ -0,0 +1,34 @@
+{
+  "pages": [
+    "pages/index/index",
+    "pages/logs/logs",
+    "pages/billing_Statistics/index",
+    "pages/store_Management/index",
+    "pages/jcy/jcy"
+  ],
+  "window": {
+    "backgroundTextStyle": "light",
+    "navigationBarBackgroundColor": "#fff",
+    "navigationBarTitleText": "Weixin",
+    "navigationBarTextStyle": "black"
+  },
+  "usingComponents": {
+    "van-button": "@vant/weapp/button/index",
+    "van-action-sheet": "@vant/weapp/action-sheet/index",
+    "van-search": "@vant/weapp/search/index",
+    "van-tab": "@vant/weapp/tab/index",
+    "van-tabs": "@vant/weapp/tabs/index",
+    "van-cell": "@vant/weapp/cell/index",
+    "van-cell-group": "@vant/weapp/cell-group/index",
+    "van-icon": "@vant/weapp/icon/index",
+    "van-panel": "@vant/weapp/panel/index",
+    "van-divider": "@vant/weapp/divider/index",
+    "van-grid": "@vant/weapp/grid/index",
+    "van-grid-item": "@vant/weapp/grid-item/index",
+    "van-uploader": "@vant/weapp/uploader/index",
+    "van-calendar": "@vant/weapp/calendar/index",
+    "van-popup": "@vant/weapp/popup/index",
+    "van-dialog": "@vant/weapp/dialog/index"
+  },
+  "sitemapLocation": "sitemap.json"
+}

et --hard commitid

@@ -0,0 +1,166 @@
+
+                   SSUUMMMMAARRYY OOFF LLEESSSS CCOOMMMMAANNDDSS
+
+      Commands marked with * may be preceded by a number, _N.
+      Notes in parentheses indicate the behavior if _N is given.
+      A key preceded by a caret indicates the Ctrl key; thus ^K is ctrl-K.
+
+  h  H                 Display this help.
+  q  :q  Q  :Q  ZZ     Exit.
+ ---------------------------------------------------------------------------
+
+                           MMOOVVIINNGG
+
+  e  ^E  j  ^N  CR  *  Forward  one line   (or _N lines).
+  y  ^Y  k  ^K  ^P  *  Backward one line   (or _N lines).
+  f  ^F  ^V  SPACE  *  Forward  one window (or _N lines).
+  b  ^B  ESC-v      *  Backward one window (or _N lines).
+  z                 *  Forward  one window (and set window to _N).
+  w                 *  Backward one window (and set window to _N).
+  ESC-SPACE         *  Forward  one window, but don't stop at end-of-file.
+  d  ^D             *  Forward  one half-window (and set half-window to _N).
+  u  ^U             *  Backward one half-window (and set half-window to _N).
+  ESC-)  RightArrow *  Right one half screen width (or _N positions).
+  ESC-(  LeftArrow  *  Left  one half screen width (or _N positions).
+  ESC-}  ^RightArrow   Right to last column displayed.
+  ESC-{  ^LeftArrow    Left  to first column.
+  F                    Forward forever; like "tail -f".
+  ESC-F                Like F but stop when search pattern is found.
+  r  ^R  ^L            Repaint screen.
+  R                    Repaint screen, discarding buffered input.
+        ---------------------------------------------------
+        Default "window" is the screen height.
+        Default "half-window" is half of the screen height.
+ ---------------------------------------------------------------------------
+
+                          SSEEAARRCCHHIINNGG
+
+  /_p_a_t_t_e_r_n          *  Search forward for (_N-th) matching line.
+  ?_p_a_t_t_e_r_n          *  Search backward for (_N-th) matching line.
+  n                 *  Repeat previous search (for _N-th occurrence).
+  N                 *  Repeat previous search in reverse direction.
+  ESC-n             *  Repeat previous search, spanning files.
+  ESC-N             *  Repeat previous search, reverse dir. & spanning files.
+  ESC-u                Undo (toggle) search highlighting.
+  &_p_a_t_t_e_r_n          *  Display only matching lines
+        ---------------------------------------------------
+        A search pattern may be preceded by one or more of:
+        ^N or !  Search for NON-matching lines.
+        ^E or *  Search multiple files (pass thru END OF FILE).
+        ^F or @  Start search at FIRST file (for /) or last file (for ?).
+        ^K       Highlight matches, but don't move (KEEP position).
+        ^R       Don't use REGULAR EXPRESSIONS.
+ ---------------------------------------------------------------------------
+
+                           JJUUMMPPIINNGG
+
+  g  <  ESC-<       *  Go to first line in file (or line _N).
+  G  >  ESC->       *  Go to last line in file (or line _N).
+  p  %              *  Go to beginning of file (or _N percent into file).
+  t                 *  Go to the (_N-th) next tag.
+  T                 *  Go to the (_N-th) previous tag.
+  {  (  [           *  Find close bracket } ) ].
+  }  )  ]           *  Find open bracket { ( [.
+  ESC-^F _<_c_1_> _<_c_2_>  *  Find close bracket _<_c_2_>.
+  ESC-^B _<_c_1_> _<_c_2_>  *  Find open bracket _<_c_1_> 
+        ---------------------------------------------------
+        Each "find close bracket" command goes forward to the close bracket 
+          matching the (_N-th) open bracket in the top line.
+        Each "find open bracket" command goes backward to the open bracket 
+          matching the (_N-th) close bracket in the bottom line.
+
+  m_<_l_e_t_t_e_r_>            Mark the current top line with <letter>.
+  M_<_l_e_t_t_e_r_>            Mark the current bottom line with <letter>.
+  '_<_l_e_t_t_e_r_>            Go to a previously marked position.
+  ''                   Go to the previous position.
+  ^X^X                 Same as '.
+  ESC-M_<_l_e_t_t_e_r_>        Clear a mark.
+        ---------------------------------------------------
+        A mark is any upper-case or lower-case letter.
+        Certain marks are predefined:
+             ^  means  beginning of the file
+             $  means  end of the file
+ ---------------------------------------------------------------------------
+
+                        CCHHAANNGGIINNGG FFIILLEESS
+
+  :e [_f_i_l_e]            Examine a new file.
+  ^X^V                 Same as :e.
+  :n                *  Examine the (_N-th) next file from the command line.
+  :p                *  Examine the (_N-th) previous file from the command line.
+  :x                *  Examine the first (or _N-th) file from the command line.
+  :d                   Delete the current file from the command line list.
+  =  ^G  :f            Print current file name.
+ ---------------------------------------------------------------------------
+
+                    MMIISSCCEELLLLAANNEEOOUUSS CCOOMMMMAANNDDSS
+
+  -_<_f_l_a_g_>              Toggle a command line option [see OPTIONS below].
+  --_<_n_a_m_e_>             Toggle a command line option, by name.
+  __<_f_l_a_g_>              Display the setting of a command line option.
+  ___<_n_a_m_e_>             Display the setting of an option, by name.
+  +_c_m_d                 Execute the less cmd each time a new file is examined.
+
+  !_c_o_m_m_a_n_d             Execute the shell command with $SHELL.
+  |XX_c_o_m_m_a_n_d            Pipe file between current pos & mark XX to shell command.
+  s _f_i_l_e               Save input to a file.
+  v                    Edit the current file with $VISUAL or $EDITOR.
+  V                    Print version number of "less".
+ ---------------------------------------------------------------------------
+
+                           OOPPTTIIOONNSS
+
+        Most options may be changed either on the command line,
+        or from within less by using the - or -- command.
+        Options may be given in one of two forms: either a single
+        character preceded by a -, or a name preceded by --.
+
+  -?  ........  --help
+                  Display help (from command line).
+  -a  ........  --search-skip-screen
+                  Search skips current screen.
+  -A  ........  --SEARCH-SKIP-SCREEN
+                  Search starts just after target line.
+  -b [_N]  ....  --buffers=[_N]
+                  Number of buffers.
+  -B  ........  --auto-buffers
+                  Don't automatically allocate buffers for pipes.
+  -c  ........  --clear-screen
+                  Repaint by clearing rather than scrolling.
+  -d  ........  --dumb
+                  Dumb terminal.
+  -D [_x_n_._n]  .  --color=_x_n_._n
+                  Set screen colors. (MS-DOS only)
+  -e  -E  ....  --quit-at-eof  --QUIT-AT-EOF
+                  Quit at end of file.
+  -f  ........  --force
+                  Force open non-regular files.
+  -F  ........  --quit-if-one-screen
+                  Quit if entire file fits on first screen.
+  -g  ........  --hilite-search
+                  Highlight only last match for searches.
+  -G  ........  --HILITE-SEARCH
+                  Don't highlight any matches for searches.
+  -h [_N]  ....  --max-back-scroll=[_N]
+                  Backward scroll limit.
+  -i  ........  --ignore-case
+                  Ignore case in searches that do not contain uppercase.
+  -I  ........  --IGNORE-CASE
+                  Ignore case in all searches.
+  -j [_N]  ....  --jump-target=[_N]
+                  Screen position of target lines.
+  -J  ........  --status-column
+                  Display a status column at left edge of screen.
+  -k [_f_i_l_e]  .  --lesskey-file=[_f_i_l_e]
+                  Use a lesskey file.
+  -K            --quit-on-intr
+                  Exit less in response to ctrl-C.
+  -L  ........  --no-lessopen
+                  Ignore the LESSOPEN environment variable.
+  -m  -M  ....  --long-prompt  --LONG-PROMPT
+                  Set prompt style.
+  -n  -N  ....  --line-numbers  --LINE-NUMBERS
+                  Don't use line numbers.
+  -o [_f_i_l_e]  .  --log-file=[_f_i_l_e]
+                  Copy to log file (standard input only).
+  -O [_f_i_l_e]  .  --LOG-FILE=[_f_i_l_e]

pages/billing_Statistics/index.js

@@ -0,0 +1,94 @@
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    date: '',
+    show: false,
+    isDisplay:true,
+  },
+  //点击图标 日历显示
+  onDisplay() {
+    this.setData({
+      show: true,
+      isDisplay:!this.data.isDisplay
+    });
+  },
+  //打开日期再次显示
+  dateShow(){
+    this.setData({
+      show:true,
+      isDisplay:false
+    })
+  },
+  onClose() {
+    this.setData({
+      show: false,
+      isDisplay:!this.data.isDisplay
+    });
+  },
+  formatDate(date) {
+    date = new Date(date);
+    return `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`;
+  },
+  onConfirm(event) {
+    const [start, end] = event.detail;
+    this.setData({
+      show: false,
+      date: `${this.formatDate(start)} 至 ${this.formatDate(end)}`,
+    });
+  },
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/billing_Statistics/index.json

@@ -0,0 +1,12 @@
+{
+  "usingComponents": {
+    "van-row":"@vant/weapp/row",
+    "van-icon":"@vant/weapp/icon",
+    "van-col": "@vant/weapp/col",
+    "van-datetime-picker": "@vant/weapp/datetime-picker",
+    "van-popup": "@vant/weapp/popup",
+    "van-calendar":"@vant/weapp/calendar",
+    "van-cell":"@vant/weapp/cell",
+    "van-button": "@vant/weapp/button"
+  }
+}

pages/billing_Statistics/index.wxml

@@ -0,0 +1,72 @@
+<view class="bill_container">
+  <view class="bill_header">
+    <van-row>
+      <van-col style="font-size: 44rpx;color:white;" span="10">
+        <van-icon name="arrow-left" />
+      </van-col>
+      <van-col style="font-size: 40rpx;color:white" span="10">账单统计</van-col>
+      <van-col span="4"></van-col>
+    </van-row>
+
+    <view class="bill_content">
+      <view class="todayBill">今日账单</view>
+      <view class="Account">入账金额：￥<span>9909.98</span>元
+      </view>
+    </view>
+
+    <view class="bill_list">
+      <view class="bill_list_content1">
+        <view><span>￥340.14</span>元</view>
+        <view>包装费</view>
+      </view>
+      <view class="bill_list_content2">
+        <view><span>￥298.00</span>元</view>
+        <view>配送费</view>
+      </view>
+      <view class="bill_list_content3">
+        <view><span>￥50.00</span>元</view>
+        <view>退款费</view>
+      </view>
+    </view>
+
+    <view class="bill_bottom">
+      <view class="bill_bottom_header">
+        <text>累计账单</text>
+        <van-icon wx:if="{{isDisplay}}" bind:click="onDisplay" name="calendar-o" />
+        <text style="color:orange;" bindtap="dateShow" wx:if="{{!isDisplay}}">{{date}}</text>
+      </view>
+      <view class="bill_bottom_content">
+        <view class="bill_bottom_contentList">
+          <view>
+            <van-icon name="gold-coin-o" /><span>￥19899.00</span>元
+          </view>
+          <view class="bill_bottom_contentList_text">入账金额</view>
+        </view>
+
+        <view class="bill_bottom_contentList">
+          <view>
+            <van-icon name="point-gift-o" /><span>￥19899.00</span>元
+          </view>
+          <view class="bill_bottom_contentList_text">包装费</view>
+        </view>
+
+        <view class="bill_bottom_contentList">
+          <view>
+            <van-icon name="logistics" /><span>￥19899.00</span>元
+          </view>
+          <view class="bill_bottom_contentList_text"> 配送费</view>
+        </view>
+
+        <view class="bill_bottom_contentList">
+          <view>
+            <van-icon name="refund-o" /><span>￥19899.00</span>元
+          </view>
+          <view class="bill_bottom_contentList_text">退款费</view>
+        </view>
+      </view>
+    </view>
+  </view>
+
+</view>
+
+<van-calendar  show="{{ show }}" type="range" bind:close="onClose" bind:confirm="onConfirm" />

pages/billing_Statistics/index.wxss

@@ -0,0 +1,110 @@
+.bill_header {
+  width: 100%;
+  height: 500rpx;
+  background-color: #FE8146;
+}
+
+.bill_content {
+  margin-left: 80rpx;
+  color: white;
+  padding-top: 60rpx;
+}
+
+.bill_content .todayBill {
+  font-size: 40rpx;
+}
+
+.bill_content .Account {
+  margin-top: 20rpx;
+  font-size: 32rpx;
+}
+
+.bill_content span {
+  font-size: 48rpx;
+}
+
+.bill_list {
+  margin-top: 100rpx;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+}
+
+.bill_list_content1,
+.bill_list_content2,
+.bill_list_content3 {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  font-size: 28rpx;
+  color: aliceblue;
+  /* background-color: aqua; */
+  padding: 20rpx;
+}
+
+.bill_list_content1,
+.bill_list_content2 {
+  border-right: 1rpx solid rgb(199, 192, 192);
+}
+
+.bill_list_content1 view span {
+  font-size: 40rpx;
+}
+
+.bill_list_content2 view span {
+  font-size: 40rpx;
+}
+
+.bill_list_content3 view span {
+  font-size: 40rpx;
+}
+
+.bill_bottom {
+  width: 100%;
+  height: 60rpx;
+}
+
+.bill_bottom_header {
+  margin-top: 20rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.bill_bottom_header text {
+  padding: 40rpx;
+  font-size: 32rpx;
+}
+
+.bill_bottom_header van-icon {
+  padding: 40rpx;
+  color: orange;
+  font-size: 50rpx;
+}
+
+.bill_bottom_content {
+
+  display: grid;
+  grid-template-rows: 1fr 1fr;
+  grid-template-columns: 1fr 1fr;
+  text-align: center;
+}
+
+.bill_bottom_contentList {
+  padding: 40rpx;
+  border: 1px solid #ccc;
+}
+
+.bill_bottom_contentList van-icon {
+  font-size: 50rpx;
+  color: orange;
+}
+
+.bill_bottom_contentList span {
+  font-size: 35rpx;
+}
+
+.bill_bottom_contentList_text {
+  font-size: 24rpx;
+  color: #ccc;
+}

pages/details/orderDetails.js

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

pages/details/orderDetails.json

@@ -0,0 +1,12 @@
+{
+  "usingComponents": {
+    "van-button": "@vant/weapp/button/index",
+    "van-nav-bar": "@vant/weapp/nav-bar/index",
+    "van-cell": "@vant/weapp/cell/index",
+    "van-cell-group": "@vant/weapp/cell-group/index",
+    "van-icon": "@vant/weapp/icon/index",
+    "van-row": "@vant/weapp/row/index",
+    "van-col": "@vant/weapp/col/index",
+    "van-image": "@vant/weapp/image/index"
+  }
+}

pages/details/orderDetails.wxml

@@ -0,0 +1,53 @@
+<view class="details">
+  <view class="address">
+    <van-cell-group inset>
+      <van-cell title="哈尔滨师范大学第一公寓2门321" label="姓名：吴迪（先生）" />
+    </van-cell-group>
+  </view>
+
+  <view class="products">
+    <van-cell-group inset>
+      <view class="products-top">
+        <van-cell border="{{false}}">
+          <image class='img-1' src='./images/malatang.png' slot="icon"></image>
+          <text class="text1">老式麻辣烫（微辣）</text>
+          <text class="text2">￥9.9+20积分</text>
+          <text class="text3">*2</text>
+          <text class="text4">￥15.9</text>
+        </van-cell>
+      </view>
+      <view class="products-content">
+        <van-cell value="￥0" label="包装费：" false value-class="cell-value1" />
+      </view>
+      <view class="products-bottom">
+        <van-cell value="￥3" label="配送费：" value-class="cell-value1" />
+      </view>
+    </van-cell-group>
+  </view>
+
+  <view class="remark">
+    <van-cell-group inset>
+      <van-cell title="" value="" label="备注" />
+      <van-cell title="" value="" label="不要香菜，不要蒜" />
+    </van-cell-group>
+  </view>
+  <view class="message">
+    <van-cell-group inset>
+      <van-cell value="989898989898989" label="订单编号：" value-class="cell-value2" />
+      <van-cell value="2023-04-26 10:43:21" label="交易时间：" value-class="cell-value2" />
+      <van-cell value="30积分" label="积分抵扣：" value-class="cell-value2" />
+      <van-cell value="￥21.98" label="实付金额：" value-class="cell-value1" />
+    </van-cell-group>
+  </view>
+
+  <view class="refund">
+    <van-row custom-class="refund-1">
+      <van-col offset="2" span="9">
+        <van-button color="#ccc" round block> 退款 </van-button>
+      </van-col>
+      <van-col offset="2" span="9">
+        <van-button color="rgb(247, 153, 47)" round block>重新打印</van-button>
+      </van-col>
+    </van-row>
+  </view>
+</view>

pages/details/orderDetails.wxss

@@ -0,0 +1,52 @@
+page{
+  background-color: rgb(243, 241, 241) ;
+}
+.address {
+  padding-top: 20rpx;
+}
+.products{
+  padding-top: 20rpx;
+}
+.img-1{
+  width: 200rpx;
+  height: 120rpx;
+  padding-right: 20rpx;
+}
+.text1{
+  float: left;
+  font-size: 26rpx;
+  color: #000;
+}
+.text2{
+  float: right;
+  font-size: 26rpx;
+  color: red;
+}
+.text3{
+  float: left;
+  font-size: 26rpx;
+}
+.text4{
+  float: right;
+  font-size: 24rpx;
+  text-decoration: line-through;
+}
+.products-top{
+  height: 140rpx;
+}
+.cell-value1{
+  color: red !important;
+  font-size: 24rpx !important;
+}
+.cell-value2{
+  font-size: 24rpx !important;
+}
+.remark{
+  padding-top: 20rpx;
+}
+.message{
+  padding-top: 20rpx;
+}
+.refund{
+  padding-top: 60rpx;
+}

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.json

@@ -1,12 +1,22 @@
 {
+<<<<<<< HEAD
   
   "usingComponents": {
     "van-tab": "@vant/weapp/tab/index",
     "van-tabs": "@vant/weapp/tabs/index",
+=======
+  "usingComponents": {
+    "van-tab": "@vant/weapp/tab/index",
+    "van-tabs": "@vant/weapp/tabs/index",
+    "van-button": "@vant/weapp/button",
+>>>>>>> 433a4c6b7ddd90c2c9e3d215e91e2fbfafb60b2c
     "van-cell": "@vant/weapp/cell/index",
     "van-cell-group": "@vant/weapp/cell-group/index",
     "van-icon": "@vant/weapp/icon/index"
   }
+<<<<<<< HEAD
   
   
+=======
+>>>>>>> 433a4c6b7ddd90c2c9e3d215e91e2fbfafb60b2c
 }

pages/index/index.wxml

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 <!--index.wxml-->
+=======
+
+>>>>>>> 433a4c6b7ddd90c2c9e3d215e91e2fbfafb60b2c
 <view class="header">
   <view class="text">
     <input type="text" placeholder="搜索用户手机号" />
@@ -127,4 +131,8 @@
 </view>
   
 </view>
-</view>
+<<<<<<< HEAD
+</view>
+=======
+</view>
+>>>>>>> 433a4c6b7ddd90c2c9e3d215e91e2fbfafb60b2c

pages/index/index.wxss

@@ -1,4 +1,5 @@
 /**index.wxss**/
+<<<<<<< HEAD
 .header{
   height: 6.16vh;
   border: gray 1px solid;
@@ -110,4 +111,25 @@ height:9vh;
 .img-box{
   text-align: center;
   font-size: 11px;
+=======
+
+.userinfo {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  color: #aaa;
+}
+
+.userinfo-avatar {
+  overflow: hidden;
+  width: 128rpx;
+  height: 128rpx;
+  margin: 20rpx;
+  border-radius: 50%;
+}
+
+.usermotto {
+  margin-top: 200px;
+
+>>>>>>> 433a4c6b7ddd90c2c9e3d215e91e2fbfafb60b2c
 }

pages/jcy/jcy.js

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

pages/jcy/jcy.json

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

pages/jcy/jcy.wxml

@@ -0,0 +1,131 @@
+<van-search value="{{ value }}" placeholder="请输入关键词" shape="round" background="#FFFFFF" use-left-icon-slot="false" />
+<!-- <van-divider /> -->
+
+<view>
+  <view class="button">
+    <view class="bon">
+      <van-button plain hairline type="primary" size="mini" round="ture">一键上架</van-button>
+      <van-button plain hairline type="primary" size="mini" color="#E73471" round="ture">一键下架</van-button>
+      <van-button plain hairline type="info" size="mini" color="#9FA0A2" round="ture"> 删除</van-button>
+    </view>
+    <checkbox-group bindchange="selectAll" style="float: left;">
+      <checkbox value="all" checked="{{checkedAll}}"></checkbox>全选
+    </checkbox-group>
+  </view>
+
+  <view class="sb">
+  <view>
+    <van-cell>
+      <view slot="title">
+        <view class="van-cell-text">
+          <van-checkbox value="{{ checked }}" checked-color="#07c160" bind:change="onChange">
+            老式麻辣烫（微辣）
+            <van-icon name="new-arrival" color="#FF8E0B" style="float: right;" />
+          </van-checkbox>
+        </view>
+      </view>
+    </van-cell>
+  </view>
+    <van-cell>
+      <view class="flex-row">
+        <view class="flex-view-item">
+          <van-image width="120" height="90" src="https://img-qn-4.51miz.com/Element/00/22/71/67/3b9c76d3_E227167_afb2884f.png!/quality/90/unsharp/true/compress/true/format/png/fh/320" />
+        </view>
+        <view class="flex-view-item">
+          <view>价格:￥9.9</view>
+          <view>原价:￥15.9</view>
+          <view>积分:20</view>
+          <view>内容:内容</view>
+        </view>
+        <view class="flex-view-item">
+          <view class="view_class">
+            <van-button type="primary" color="#999999" size="mini">修改</van-button>
+            <van-button type="primary" color="#999999" size="mini">删除</van-button>
+          </view>
+        </view>
+      </view>
+    </van-cell>
+  </view>
+
+  <view class="sb">
+    <van-cell>
+      <view slot="title">
+        <view class="van-cell-text">
+          <van-checkbox value="{{ checked }}" checked-color="#07c160" bind:change="onChange">
+            老式麻辣烫（微辣）
+            <van-icon name="new-arrival" color="#FF8E0B" style="float: right;" />
+          </van-checkbox>
+        </view>
+       
+      </view>
+    </van-cell>
+    <van-cell>
+      <view class="flex-row">
+        <view class="flex-view-item">
+          <van-image width="120" height="90" src="https://img-qn-4.51miz.com/Element/00/22/71/67/3b9c76d3_E227167_afb2884f.png!/quality/90/unsharp/true/compress/true/format/png/fh/320" />
+        </view>
+        <view class="flex-view-item">
+          <view>价格:￥9.9</view>
+          <view>原价:￥15.9</view>
+          <view>积分:20</view>
+          <view>内容:内容</view>
+        </view>
+        <view class="flex-view-item">
+          <view class="view_class">
+            <van-button type="primary" color="#999999" size="mini">修改</van-button>
+            <van-button type="primary" color="#999999" size="mini">删除</van-button>
+          </view>
+        </view>
+      </view>
+    </van-cell>
+  </view>
+
+
+  <view class="sb">
+    <van-cell>
+      <view slot="title">
+        <view class="van-cell-text">
+          <van-checkbox value="{{ checked }}" checked-color="#07c160" bind:change="onChange">
+            老式麻辣烫（微辣）
+            <van-icon name="new-arrival" color="#FF8E0B" style="float: right;" />
+          </van-checkbox>
+
+        </view>
+      </view>
+    </van-cell>
+    <van-cell>
+      <view class="flex-row">
+        <view class="flex-view-item">
+          <van-image width="120" height="90" src="https://img-qn-4.51miz.com/Element/00/22/71/67/3b9c76d3_E227167_afb2884f.png!/quality/90/unsharp/true/compress/true/format/png/fh/320" />
+        </view>
+        <view class="flex-view-item">
+          <view>价格:￥9.9</view>
+          <view>原价:￥15.9</view>
+          <view>积分:20</view>
+          <view>内容:内容</view>
+        </view>
+        <view class="flex-view-item">
+          <view class="view_class">
+            <van-button type="primary" color="#999999" size="mini">修改</van-button>
+            <van-button type="primary" color="#999999" size="mini">删除</van-button>
+          </view>
+        </view>
+      </view>
+    </van-cell>
+  </view>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</view>

pages/jcy/jcy.wxss

@@ -0,0 +1,30 @@
+/* pages/jcy/jcy.wxss */
+/**index.wxss**/
+
+.button {
+  margin: 5px 15px;
+}
+.bon {
+  float: right;
+}
+van-button {
+  margin-left: 10px;
+}
+.view_class {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-end;
+}
+.flex-row{
+  width: 350px;
+  display: flex;
+  flex-direction: row;
+  /* justify-content :center; */
+}
+.flex-view-item{
+  width: 30%;
+}
+.view_class{
+  margin-right: 5px;
+  margin-top: 45px;
+}

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="login">
+  <!-- 头像 -->
+  <van-image class="header" round width="230rpx" height="230rpx" src="/images/header.png" />
+
+  <!-- 输入框 -->
+  <van-cell-group>
+    <van-field  value="{{ username }}" placeholder="请输入你的账号" border="{{ false }}"/>
+
+    <van-field  value="{{ password }}" type="password" placeholder="请输入新密码" border="{{ false }}"/>
+  </van-cell-group>
+
+  <!-- 登录按钮 -->
+  <van-button type="info">登录</van-button>
+</view>

pages/login/login.wxss

@@ -0,0 +1,27 @@
+/* 登陆页面总样式 */
+.login {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
+/* 头像样式 */ 
+.header {
+  margin: 130rpx;
+}
+/* 输入框样式 */
+.van-field__control {
+  border: 1px solid #ccc !important;
+  width: 600rpx !important;
+  height: 100rpx !important;
+  border-radius: 5px;
+  padding-left: 20rpx !important;
+}
+
+/* 登录按钮样式 */
+.van-button {
+  margin-top: 280rpx;
+  width: 600rpx;
+  border-radius: 5px !important;
+}

pages/message/message.js

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

pages/message/message.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "van-panel": "@vant/weapp/panel"
+  }
+}

pages/message/message.wxml

@@ -0,0 +1,21 @@
+<view class="order">
+  <van-panel class="total" title="订单编号：898989898" status="详细>">
+    <view>
+      <van-cell class="name" title="姓名:吴迪(先生)" value="已送达" value-class="cell-value" border="{{ false }}" />
+    </view>
+    <view class="mess1">手机号:1389091919</view>
+    <view class="mess1">地址:哈尔滨师范大学公寓2号楼1门</view>
+    <view class="mess1">下单时间:2022-08-18 13:18:34</view>
+    <view class="mess1">配送人:冯传宇</view>
+  </van-panel>
+</view>
+<van-panel class="total" title="订单编号：898989898" status="详细>">
+  <view>
+    <van-cell class="name" title="姓名:吴迪(先生)" value="已送达" value-class="cell-value" border="{{ false }}" />
+  </view>
+  <view class="mess1">手机号:1389091919</view>
+  <view class="mess1">地址:哈尔滨师范大学公寓2号楼1门</view>
+  <view class="mess1">下单时间:2022-08-18 13:18:34</view>
+  <view class="mess1">配送人:冯传宇</view>
+
+</van-panel>

pages/message/message.wxss

@@ -0,0 +1,24 @@
+
+.name{
+  display: block;
+  color: #1db925;
+  font-size: 12px;
+  
+}
+.total{
+  display: block;
+  margin-top: 5px;
+
+}
+.mess1{
+  margin-left: 15px;
+  display: block;
+  color: #706868;
+  font-size: 15px;
+  margin-bottom: 8px;
+  margin-top: -2px;
+  font-size: 15px;
+}
+.cell-value{
+  color: rgb(25, 228, 18)!important;
+}

pages/search/search.js

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

pages/search/search.json

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

pages/search/search.wxml

@@ -0,0 +1,95 @@
+<!--pages/search/search.wxml-->
+<!-- <text>pages/search/search.wxml</text> -->
+<!--pages/search/search.wxml-->
+<!-- <text>pages/search/search.wxml</text> -->
+<view class="all">  
+
+<view class="search-top">
+<view class="box">
+<input type="text" class="input"
+placeholder="16900002345"
+/>
+<input type="text"
+value="搜索"
+class="button"/>
+</view>
+</view>
+
+<view class="search-box">
+
+<van-panel class="total" title="订单编号：989898989" status="详情>">
+<!-- 内容 -->
+<view>
+
+<view>
+<van-cell 
+title="姓名：吴迪(先生)" 
+value="待送达" 
+border="{{ false }}"  
+value-class="value-name2"
+class="name"/>
+</view>  
+
+<view>
+<view class="message">手机号：13890091919</view>
+</view>
+
+<view>
+<view class="message">地址：哈尔滨施法大学公寓2号楼1门</view>
+</view>
+
+<view>
+<view class="message">下单时间：2022-08-18 13:18:34</view>
+
+<view class="reprint" >
+<van-button size="mini" color="#ff8e0b">重新打印</van-button>
+</view>
+</view>
+
+</view>
+</van-panel>
+</view>
+
+<view class="search-box">
+
+<van-panel class="total" title="订单编号：989898989" status="详情>" >
+<!-- 内容 -->
+<view>
+
+<view>
+<van-cell 
+title="姓名：吴迪(先生)" 
+title-class="title-name2"
+value="待送达" 
+border="{{ false }}" 
+value-class="value-name2"
+class="name"/>
+</view>  
+
+
+<view>
+<view class="message">手机号：13890091919</view>
+</view>
+
+<view>
+<view class="message">地址：哈尔滨施法大学公寓2号楼1门</view>
+</view>
+
+<view>
+<view class="message">下单时间：2022-08-18 13:18:34</view>
+
+<view class="reprint">
+<van-button size="mini" color="#ff8e0b" >重新打印</van-button>
+</view>
+</view>
+
+
+</view>
+</van-panel>
+
+</view>
+
+</view>
+
+
+

pages/search/search.wxss

@@ -0,0 +1,85 @@
+/* pages/search/search.wxss */
+page{
+  background-color: #eff0f5;
+
+}
+.all{
+}
+.search-top {
+height: 55px;
+background-color: white;
+padding-bottom: 10px;
+
+ padding-top: 5px;
+}
+.box{
+  width:340px;
+  height:32px;
+  border:1px solid #b2b2b2;
+  margin:auto;
+  margin-top: 15px;
+  /* margin-bottom: 15px; */
+  border-radius: 40px;
+  background: white;
+}
+.input{
+  height:38px;
+  outline:none;
+  border:none;
+  
+  margin-left: 23px;
+  margin-top: -2px;
+  color: #cacaca;
+  font-size: 13px;
+}
+.button{
+	float:left;
+	width:64px;
+	height:19px;
+	color:white;
+  background-color:#ff8e0b;
+  outline:none;
+  border-radius: 40px;
+  text-align: center;
+  float: right;
+  margin-top: -31px;
+  margin-right:8px;
+  font-size: 13px;
+}
+
+
+.search-box {
+  margin-left: -2px;
+  margin-right: -2px;
+  height: 160px;
+}
+
+.total {
+  display: block;
+  margin: 20px 20px 1px 20px;
+}
+.title-name2{
+  /* font-size: 13px; */
+}
+.value-name2{
+  color: #ffa34a !important;
+}
+
+.message{
+  margin-left: 15px;
+  display: block;
+  color: #706868;
+  font-size: 14px;
+  margin-bottom: 8px;
+}
+
+.reprint{
+   float: right;
+    display: inline;
+    margin-top: -40px;
+    margin-right: 10px;
+  }
+
+
+
+

pages/store_Management/index.js

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

pages/store_Management/index.json

@@ -0,0 +1,13 @@
+{
+  "navigationBarTitleText": "店铺管理",
+  "usingComponents": {
+    "van-row": "@vant/weapp/row",
+    "van-icon": "@vant/weapp/icon",
+    "van-col": "@vant/weapp/col",
+    "van-datetime-picker": "@vant/weapp/datetime-picker",
+    "van-popup": "@vant/weapp/popup",
+    "van-calendar": "@vant/weapp/calendar",
+    "van-cell": "@vant/weapp/cell",
+    "van-nav-bar": "@vant/weapp/nav-bar"
+  }
+}

pages/store_Management/index.wxml

@@ -0,0 +1,39 @@
+<view class="storeManage_container">
+    <view class="store_pic">
+        <text class="store_text">店铺图片</text>
+        <view class="store_upload">
+            <image src="{{imagePath}}"></image>
+            <text class="store_plus" bindtap="handleChooseAlbum">+</text>
+        </view>
+    </view>
+    <view class="store_name">
+        <view class="store_name_text">店铺名称</view>
+        <input type="text" placeholder="请输入店铺名称" />
+    </view>
+    <view class="dispatch_fee">
+        <text>配送费(￥)</text>
+        <span>5.00</span>
+    </view>
+    <view class="dispatch_time">
+        <text>配送时长</text>
+        <input type="text" placeholder="请输入时长" />
+    </view>
+    <view class="package_fee">
+        <text>包装费(￥)</text>
+        <input type="text" placeholder="请输入金额" />
+    </view>
+    <view class="open_time">
+        <text>营业时间</text>
+        <input type="text" placeholder="请输入营业时间" />
+    </view>
+    <view class="custom_service">
+        <view class="custom_service_text">客服电话</view>
+        <input type="text" placeholder="请输入客服电话" />
+    </view>
+    <view class="store_notify">
+        <text>公告</text>
+        <textarea name="" id="" cols="30" rows="10" placeholder="请提供更多参考信息帮助我们核实,如周边标志建筑、近邻商户等。">
+        </textarea>
+    </view>
+    <button>提交</button>
+</view>

pages/store_Management/index.wxss

@@ -0,0 +1,177 @@
+page {
+    background-color: #EFF0F5;
+}
+
+.storeManage_container view {
+    background-color: white;
+    margin-top: 30rpx;
+}
+
+.storeManage_container .store_pic {
+    width: 100%;
+    height: 200rpx;
+    position: relative;
+}
+
+.store_pic {
+    position: relative;
+}
+
+.store_pic .store_text {
+    color: black;
+    position: absolute;
+    top: 14%;
+    left: 8%;
+}
+
+.store_upload {
+    width: 200rpx;
+    position: absolute;
+    height: 160rpx;
+    border: 1px dashed rgb(143, 142, 142);
+    right: 4%;
+    top: -5%;
+}
+
+.store_upload image {
+    width: 100%;
+    height: 100%;
+    /* background-color: blue; */
+}
+
+.store_upload .store_plus {
+    position: absolute;
+    font-size: 40rpx;
+    top: 30%;
+    left: 45%;
+}
+
+/* Ming */
+.store_name {
+    width: 100%;
+    height: 180rpx;
+    /* background-color: burlywood !important; */
+    text-align: left;
+}
+
+.store_name .store_name_text {
+    width: 100%;
+    border-bottom: 1px solid rgb(146, 146, 146);
+    padding: 40rpx;
+}
+
+.store_name input {
+    padding: 10rpx;
+    padding-left: 40rpx;
+}
+
+/* 配送 */
+.dispatch_fee {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.dispatch_fee text {
+    padding: 30rpx;
+    padding-left: 40rpx;
+}
+
+.dispatch_fee span {
+    padding: 30rpx;
+    padding-right: 40rpx;
+    color: red;
+}
+
+/* 配送时长 */
+.dispatch_time {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.dispatch_time text {
+    padding: 30rpx;
+    padding-left: 40rpx;
+}
+
+.dispatch_time input {
+    padding: 30rpx;
+    color: red;
+    padding-right: 0px;
+}
+
+/* 包装费 */
+.package_fee {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.package_fee text {
+    padding: 30rpx;
+    padding-left: 40rpx;
+}
+
+.package_fee input {
+    padding: 30rpx;
+    color: red;
+    padding-right: 0px;
+}
+
+/* 营业时间 */
+.open_time {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.open_time text {
+    padding: 30rpx;
+    padding-left: 40rpx;
+}
+
+.open_time input {
+    padding: 30rpx;
+    color: red;
+    padding-right: 0px;
+}
+
+/* 客服电话 */
+.custom_service .custom_service_text {
+    width: 100%;
+    border-bottom: 1px solid rgb(146, 146, 146);
+    padding: 40rpx;
+}
+
+.custom_service input {
+    padding: 10rpx;
+    padding-left: 40rpx;
+}
+
+/* 公告 */
+.store_notify {
+    width: 100%;
+    overflow: hidden;
+   
+}
+
+.store_notify text {
+    padding-top: 200rpx;
+    padding-left: 50rpx;
+    font-size: 40rpx;
+
+}
+
+.store_notify textarea {
+    margin-left: 80rpx;
+    margin-top: 40rpx;
+    border: 1px solid rgb(180, 180, 180);
+    border-radius: 5%;
+    text-indent: 1em;
+}
+button{
+    margin-top: 40rpx;
+    background-color: #55B3F4;
+    width: 600rpx;
+}

pink/app.json

@@ -0,0 +1,36 @@
+{
+  "pages": [
+    "pages/search/search",
+    "pages/index/index",
+    "pages/logs/logs",
+    "pages/billing_Statistics/index",
+    "pages/store_Management/index",
+    "pages/jcy/jcy",
+    "pages/search/search"
+  ],
+  "window": {
+    "backgroundTextStyle": "light",
+    "navigationBarBackgroundColor": "#fff",
+    "navigationBarTitleText": "Weixin",
+    "navigationBarTextStyle": "black"
+  },
+  "usingComponents": {
+    "van-button": "@vant/weapp/button/index",
+    "van-action-sheet": "@vant/weapp/action-sheet/index",
+    "van-search": "@vant/weapp/search/index",
+    "van-tab": "@vant/weapp/tab/index",
+    "van-tabs": "@vant/weapp/tabs/index",
+    "van-cell": "@vant/weapp/cell/index",
+    "van-cell-group": "@vant/weapp/cell-group/index",
+    "van-icon": "@vant/weapp/icon/index",
+    "van-panel": "@vant/weapp/panel/index",
+    "van-divider": "@vant/weapp/divider/index",
+    "van-grid": "@vant/weapp/grid/index",
+    "van-grid-item": "@vant/weapp/grid-item/index",
+    "van-uploader": "@vant/weapp/uploader/index",
+    "van-calendar": "@vant/weapp/calendar/index",
+    "van-popup": "@vant/weapp/popup/index",
+    "van-dialog": "@vant/weapp/dialog/index"
+  },
+  "sitemapLocation": "sitemap.json"
+}

project.config.json

@@ -47,7 +47,11 @@
   },
   "compileType": "miniprogram",
   "libVersion": "2.19.4",
+<<<<<<< HEAD
   "appid": "wxe1ecd56185c011f9",
+=======
+  "appid": "wx57c1363607c7f1e8",
+>>>>>>> 433a4c6b7ddd90c2c9e3d215e91e2fbfafb60b2c
   "projectname": "miniprogram-92",
   "condition": {},
   "editorSetting": {

project.private.config.json

@@ -4,5 +4,56 @@
   "setting": {
     "compileHotReLoad": true
   },
+<<<<<<< HEAD
   "libVersion": "2.19.6"
+=======
+  "condition": {
+    "miniprogram": {
+      "list": [
+        {
+          "name": "搜索",
+          "pathName": "pages/search/search",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/increase/increase",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/store_Management/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/message/message",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/details/orderDetails",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/login/login",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        }
+      ]
+    }
+  }
+>>>>>>> 433a4c6b7ddd90c2c9e3d215e91e2fbfafb60b2c
 }