新建里海云仓页面

components/home/index.vue

@@ -1,10 +1,14 @@
 <template>
   <view style="touch-action: none;" :style="viewColor">
-		<view class="home" style="position:fixed;" :style="{ top: top + 'px', bottom: bottom }" id="right-nav" @touchmove.stop.prevent="setTouchMove">
+    <view class="home" style="position:fixed;" :style="{ top: top + 'px', bottom: bottom }" id="right-nav"
+      @touchmove.stop.prevent="setTouchMove">
       <view class="homeCon" :class="homeActive === true ? 'on' : ''" v-if="homeActive">
-				<navigator hover-class='none' url='/pages/home/index' open-type='switchTab' class='iconfont icon-shouye-xianxing'></navigator>
+        <navigator hover-class='none' url='/pages/index/index' open-type='switchTab'
-				<navigator hover-class='none' url='/pages/order_addcart/order_addcart' open-type='navigate' class='iconfont icon-caigou-xianxing'></navigator>
+          class='iconfont icon-shouye-xianxing'></navigator>
-				<navigator hover-class='none' url='/pages/user/index' open-type='switchTab' class='iconfont icon-yonghu1'></navigator>
+        <navigator hover-class='none' url='/pages/order_addcart/order_addcart' open-type='navigate'
+          class='iconfont icon-caigou-xianxing'></navigator>
+        <navigator hover-class='none' url='/pages/user/index' open-type='switchTab' class='iconfont icon-yonghu1'>
+        </navigator>
       </view>
       <view @click="open" class="pictrueBox">
         <view class="pictrue">
@@ -16,15 +20,6 @@
   </view>
 </template>
 <script>
-	// +----------------------------------------------------------------------
-	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-	// +----------------------------------------------------------------------
-	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
-	// +----------------------------------------------------------------------
-	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-	// +----------------------------------------------------------------------
-	// | Author: CRMEB Team <admin@crmeb.com>
-	// +----------------------------------------------------------------------
   import { mapGetters } from "vuex";
   import { HTTP_REQUEST_URL } from '@/config/app';
   export default {
@@ -61,6 +56,7 @@
     width: 130rpx;
     height: 120rpx;
   }
+
   /*返回主页按钮*/
   .home {
     position: fixed;
@@ -70,6 +66,7 @@
     right: 15rpx;
     display: flex;
   }
+
   .home .homeCon {
     border-radius: 50rpx;
     opacity: 0;
@@ -77,6 +74,7 @@
     color: #e93323;
     width: 0;
   }
+
   .home .homeCon.on {
     opacity: 1;
     animation: bounceInRight 0.5s cubic-bezier(0.215, 0.610, 0.355, 1.000);
@@ -88,12 +86,14 @@
     align-items: center;
     background: var(--view-theme);
   }
+
   .home .homeCon .iconfont {
     font-size: 48rpx;
     color: #fff;
     display: inline-block;
     margin: 0 auto;
   }
+
   .home .pictrue {
     width: 86rpx;
     height: 86rpx;
@@ -102,10 +102,12 @@
     background-color: var(--view-theme);
     box-shadow: 0 5rpx 12rpx rgba(0, 0, 0, 0.5);
   }
+
   .home .pictrue .image {
     width: 100%;
     height: 100%;
   }
+
   .pictruea {
     width: 100%;
     height: 100%;

components/zbpSwiper.vue

@@ -27,14 +27,14 @@
         :autoplay="swiper.autoplay" :interval="swiper.interval" :duration="swiper.duration"
         indicator-active-color="#fff">
         <block v-for="(item,index) in swiper['url']" :key="index">
-          <swiper-item class="swi_item">
+          <swiper-item class="swi_item" @click="swiperClick(item)">
             <u--image :showLoading="true" :src="item.img" width="694.74rpx" height="242.11rpx" mode="aspectFill">
             </u--image>
           </swiper-item>
         </block>
       </swiper>
     </view>
-    <u-picker :defaultIndex="[0,0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
+    <u-picker :defaultIndex="defaInd" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
       @cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
   </view>
 </template>
@@ -58,6 +58,7 @@
     },
     data() {
       return {
+        defaInd: [0, 0],
         street: '',
         showPicker: false,
         styleConfig: [],
@@ -92,6 +93,12 @@
       this.street = JSON.parse(this.location).address_component.street
     },
     methods: {
+      swiperClick(item) {
+        const url = item.info[1].value
+        uni.navigateTo({
+          url: url
+        })
+      },
       selectLocation() {
         this.isSelectPlace ? this.showPicker = true : ''
       },
@@ -109,9 +116,7 @@
           picker = this.$refs.uPicker
         } = e;
         if (columnIndex === 0) {
-          getStreet({
+          getStreet({ area_code: value[0]['code'] }).then(res => {
-            area_code: value[0]['code']
-          }).then(res => {
             picker.setColumnValues(1, res.data);
           });
         }

pages.json

@@ -95,8 +95,7 @@
 
     }
   ],
-  "subPackages": [
+  "subPackages": [{
-    {
       "root": "pages/goods_cate",
       "name": "goods_cate",
       "pages": [{
@@ -215,6 +214,13 @@
             "enablePullDownRefresh": false
           }
 
+        }, {
+          "path": "cloud_entrepot/index",
+          "style": {
+            "navigationBarTitleText": "里海云仓",
+            "enablePullDownRefresh": false
+          }
+
         }
       ]
     },
@@ -788,7 +794,8 @@
       "pages": [{
           "path": "list/index",
           "style": {
-            "navigationBarTitleText": "商品管理"
+            "navigationBarTitleText": "商品管理",
+            "enablePullDownRefresh": true
           }
         },
         {

pages/admin/stockOut/index.vue

@@ -327,10 +327,14 @@
         })
       },
       async addCartGoods(code) {
-        const res = await addCartApi({ bar_code: code }).catch(err => Toast(err))
+        try {
+          const res = await addCartApi({ bar_code: code })
           this.getCartList();
           this.getCartNum();
           Toast('添加成功')
+        } catch (e) {
+          Toast(e)
+        }
       },
       pay() {
         let selectValue = []

pages/index/style/main.scss

@@ -288,7 +288,7 @@
 			.price-box {
 				display: flex;
 				align-items: center;
-				justify-content: start;
+				justify-content: flex-start;
 				margin-top: 4rpx;
 				&.presell-price {
 					display: block;

pages/nongKe/cloud_entrepot/index.vue

@@ -0,0 +1,178 @@
+<template>
+  <view class="cloud_entrepot">
+    <view class="head-wrapper"></view>
+    <view class="town-title">通滩镇里海云仓</view>
+    <view class="body-wrapper">
+      <block v-for="(item,index) in cloudList" :key="index">
+        <view class="item" :style="{'background-image': `url(${item.bg})`}">
+          <text class="item-title">{{item.title}}</text>
+          <text>{{item.text}}</text>
+          <view class="chakan-btn" @click="navigator">查看</view>
+        </view>
+      </block>
+    </view>
+  </view>
+</template>
+
+<script>
+  let url = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13';
+  export default {
+    data() {
+      return {
+        cloudList: [{
+            title: '商超服务云仓服务',
+            text: '便捷商超购物，包送到家',
+            bg: url + '/shangchao.png'
+          },
+          {
+            title: '农副产品云仓服务',
+            text: '瓜果蔬菜线上购买',
+            bg: url + '/nongfu.png'
+          },
+          {
+            title: '生活服务云仓服务',
+            text: '生活服务样样齐全',
+            bg: url + '/shenghuo.png'
+          },
+          {
+            title: '农业生产云仓服务',
+            text: '种子化肥送到家',
+            bg: url + '/nongye.png'
+          },
+          {
+            title: '物流溯源云仓服务',
+            text: '追溯产品源头',
+            bg: url + '/wuliu.png'
+          },
+          {
+            title: '坝坝宴云仓服务',
+            text: '农家各种酒席宴会',
+            bg: url + '/yan.png'
+          },
+          {
+            title: '文娱旅游云仓服务',
+            text: '周边好玩景点',
+            bg: url + '/shangchao.png'
+          },
+          {
+            title: '民生公益云仓服务',
+            text: '扶贫助学项目',
+            bg: url + '/minsheng.png'
+          },
+          {
+            title: '医疗保健云仓服务',
+            text: '便捷医疗服务',
+            bg: url + '/yiliao.png'
+          },
+          {
+            title: '教育培训云仓服务',
+            text: '更完善的教育系统',
+            bg: url + '/jiaoyu.png'
+          },
+          {
+            title: '装修建筑云仓服务',
+            text: '个人家庭商铺装修',
+            bg: url + '/zhuangxiu.png'
+          }
+        ]
+      }
+    },
+    onLoad() {},
+    onShow() {},
+    onPullDownRefresh() {
+      uni.stopPullDownRefresh()
+    },
+    methods: {
+      navigator() {
+        uni.navigateTo({
+          url: '/pages/user/index'
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+  .cloud_entrepot {
+    background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/ycbg.png") no-repeat;
+    background-size: cover;
+  }
+
+  .head-wrapper {
+    height: 485.96rpx;
+    width: 100%;
+    background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/top.png") no-repeat;
+    background-size: cover;
+    margin-bottom: 49.12rpx;
+  }
+
+  .town-title {
+    margin: 0 auto;
+    width: 100%;
+    text-align: center;
+    font-size: 50.88rpx;
+    color: #fff;
+    margin-bottom: 28.07rpx;
+
+    &::after {
+      content: '';
+      display: inline-block;
+      width: 66.67rpx;
+      height: 31.58rpx;
+      background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/you.png") no-repeat;
+      background-size: cover;
+      margin-left: 24.56rpx;
+    }
+
+    &::before {
+      content: '';
+      display: inline-block;
+      width: 66.67rpx;
+      height: 31.58rpx;
+      background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/zuo.png") no-repeat;
+      background-size: cover;
+      margin-right: 24.56rpx;
+    }
+  }
+
+  .body-wrapper {
+    width: 694.74rpx;
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+    margin: 0 auto;
+
+    .item {
+      width: 336.84rpx;
+      height: 100%;
+      padding: 24.56rpx 28.07rpx;
+      margin-bottom: 21.05rpx;
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+
+      text {
+        display: block;
+        font-size: 24.56rpx;
+        color: #999;
+        margin-bottom: 14.04rpx;
+      }
+
+      .item-title {
+        font-size: 31.58rpx;
+        color: #333;
+      }
+
+      .chakan-btn {
+        width: 114.04rpx;
+        height: 49.12rpx;
+        font-size: 28.07rpx;
+        text-align: center;
+        line-height: 49.12rpx;
+        color: #fff;
+        margin-top: auto;
+        background: linear-gradient(90deg, #FE5300 0%, #F84221 100%);
+        border-radius: 50px;
+      }
+    }
+  }
+</style>

pages/nongKe/supply_chain/supplier.vue

@@ -71,9 +71,9 @@
                   </view>
                 </view>
               </view>
-              <view class="pro-box" :class="'styleType'+store_street_theme">
+              <scroll-view scroll-x="true" class="pro-box" :class="'styleType'+store_street_theme">
                 <navigator :url="`/pages/goods_details/index?id=${itemn.product_id}&product_type=${product_type}`"
-                  hover-class="none" class="pro-item" v-for="(itemn,indexn) in item.recommend.slice(0,3)" :key='indexn'>
+                  hover-class="none" class="pro-item" v-for="(itemn,indexn) in item.recommend" :key='indexn'>
                   <view class="picture">
                     <easy-loadimage mode="widthFix" :image-src="itemn.image"></easy-loadimage>
                     <view v-if="itemn.border_pic" :style="{ backgroundImage: `url(${itemn.border_pic})` }"
@@ -83,7 +83,7 @@
                     <text>￥</text>{{itemn.price}}
                   </view>
                 </navigator>
-              </view>
+              </scroll-view>
             </view>
           </block>
           <block v-if="store_street_theme == 2">
@@ -112,7 +112,7 @@
                   </view>
                   <view class="pro-box">
                     <navigator :url="`/pages/goods_details/index?id=${itemn.product_id}`" hover-class="none"
-                      class="pro-item" v-for="(itemn,indexn) in item.recommend.slice(0,3)" :key='indexn'>
+                      class="pro-item" v-for="(itemn,indexn) in item.recommend" :key='indexn'>
                       <view class="picture">
                         <easy-loadimage mode="widthFix" :image-src="itemn.image"></easy-loadimage>
                         <view v-if="itemn.border_pic" :style="{ backgroundImage: `url(${itemn.border_pic})` }"
@@ -155,8 +155,7 @@
                 </view>
               </view>
               <view class="pro-box" :class="'styleType'+store_street_theme">
-                <view class="pro-item" v-for="(itemn,indexn) in item.recommend.slice(0,3)" :key='indexn'
+                <view class="pro-item" v-for="(itemn,indexn) in item.recommend" :key='indexn' v-if="indexn<=2">
-                  v-if="indexn<=2">
                   <view @click="go_details(itemn.product_type,itemn.product_id)">
                     <view class="picture">
                       <image :src="itemn.image"></image>
@@ -883,11 +882,13 @@
       }
 
       .pro-box {
+        white-space: nowrap;
         display: flex;
         align-items: center;
         padding: 20rpx 20rpx 30rpx;
 
         .pro-item {
+          display: inline-block;
           width: 218rpx;
           margin-right: 14rpx;
 
@@ -920,6 +921,7 @@
           padding: 20rpx;
 
           .pro-item {
+            display: inline-block;
             background-color: #fff;
             border-radius: 16rpx;
             text-align: center;
@@ -1028,11 +1030,13 @@
       }
 
       .pro-box {
+        white-space: nowrap;
         display: flex;
         align-items: center;
         margin-top: 20rpx;
 
         .pro-item {
+          display: inline-block;
           width: 170rpx;
           margin-right: 20rpx;
 

pages/short_video/appSwiper/index.nvue

@@ -1138,8 +1138,8 @@
 
     .icon-xiangzuo {
       margin-left: 10px;
-      width: 16px;
+      width: 20px;
-      height: 16px;
+      height: 20px;
       color: #ffffff;
     }
   }

pages/supply_chains/supply_chains.vue

@@ -164,10 +164,12 @@
         if (this.mer_id == 0) {
           return Toast('当前区域没有云仓库')
         }
-        console.log(this.mer_id)
         uni.navigateTo({
-          url: '/pages/store/home/index?id=' + this.mer_id + '&LihaiYun=Lihai'
+          url: '/pages/nongKe/cloud_entrepot/index'
         })
+        // uni.navigateTo({
+        //   url: '/pages/store/home/index?id=' + this.mer_id + '&LihaiYun=Lihai'
+        // })
       },
       async getArticle() {
         let list = []
@@ -220,12 +222,10 @@
     .l_yun {
       width: 456.14rpx;
       border-radius: 16rpx;
-      background-image: url("@/static/images/zonghe.png");
       background-repeat: no-repeat;
       background-size: cover;
       overflow: hidden;
       position: relative;
-
       display: flex;
       flex-direction: column;
       align-items: center;
@@ -278,7 +278,7 @@
       font-size: 35.09rpx;
       padding-top: 28.07rpx;
       text-align: center;
-      background: url("@/static/images/lihaiyun.png") no-repeat;
+      background-repeat: no-repeat;
       background-size: cover;
       box-sizing: border-box;
       border-radius: 16rpx;

pages/users/embody/embody.vue

@@ -262,9 +262,14 @@
     },
     methods: {
       async getApply() {
+        try {
           const res = await getAdminApplyAPI(this.merId)
           this.mode.real_name = res.data.financial_bank_name
           this.mode.bank_code = res.data.financial_bank_code
+        } catch (err) {
+          //TODO handle the exception
+          Toast(err)
+        }
       },
       loadType() {
         this.pay_type = []