jufubao-mall 2.0.32 → 2.0.34

package/src/components/JfbMallConfirm/shopList.vue

@@ -1,25 +1,27 @@
 <template>
   <view class="chose_shop_list">
-    <view class="shop-search">
-      <input
-        class="uni-input"
-        placeholder="输入门店名称"
-        :value="keyword"
-        @input="handleInput"
-        @confirm="handleInput"
-      />
-      <view>
-        <xd-font-icon icon="iconsousuo_mian" color="#666" size="32"></xd-font-icon>
+    <view class="shop_header">
+      <view style="display: flex;align-items: center;">
+        <xd-city-show
+          city-location-type="baidu"
+          @done="handleCityDone"
+          @onChange="handleCityChange"
+          color="#333"></xd-city-show>
+      </view>
+      <view class="shop-search">
+        <input
+          class="uni-input"
+          placeholder="输入门店名称"
+          :value="keyword"
+          @input="handleInput"
+          @confirm="handleInput"
+        />
+        <view>
+          <xd-font-icon icon="iconsousuo_mian" color="#999999" size="28"></xd-font-icon>
+        </view>
       </view>
     </view>
-    <view class="chose_location">
-      <xd-city-show
-        city-location-type="baidu"
-        @done="handleCityDone"
-        @onChange="handleCityChange"
-        color="#333"></xd-city-show>
-      <view class="switch_city" @click="handleCityChange">切换城市 <xd-font-icon size="28" icon="iconxiangyou_xian"></xd-font-icon> </view>
-    </view>
+    
     <view class="shop_list" v-if="list && list.length">
       <view
         class="shop_item"
@@ -33,31 +35,38 @@
         <view class="shop_info">
           <view class="shop_name">
             <view class="_name">{{item.resource_shop_name}}</view>
-            <view class="distance" v-if="item.distance">{{item.distance}}</view>
+            <!-- <view class="distance" v-if="item.distance">{{item.distance}}</view> -->
           </view>
           <view>
             <view class="shop_sub">
-              <view class="_icon"><xd-font-icon size="32" icon="icondizhitubiao"></xd-font-icon></view>
-              <view>{{item.address}}</view>
+              <!-- <view class="_icon"><xd-font-icon size="32" icon="icondizhitubiao"></xd-font-icon></view> -->
+              <view class="addr_text">{{item.address}}</view>
+              <view v-if="item.distance">{{item.distance}}</view>
             </view>
             <view class="shop_sub">
-              <view class="_icon"><xd-font-icon size="32" icon="icondianhuatubiao"></xd-font-icon></view>
+              <view class="_icon"><xd-font-icon size="24" icon="icondianhuatubiao"></xd-font-icon></view>
               <view>{{item.phone}}</view>
             </view>
           </view>
         </view>
       </view>
     </view>
-    <view v-else class="empty_data">该地区暂无可选门店</view>
+    <view v-else class="empty_data">
+      <xd-no-data :scaleSize="3" iconType="shop">
+        <view style="margin-top: -100rpx;">该地区暂无可选门店</view>
+      </xd-no-data>
+    </view>
   </view>
 </template>
 <script>
 import XdCityShow from "@/components/XdCityShowApi/XdCityShowApi"
 import XdFontIcon from "@/components/XdFontIcon/XdFontIcon"
+import XdNoData from "@/components/XdNoData/XdNoData"
 export default {
   components: {
     XdCityShow,
-    XdFontIcon
+    XdFontIcon,
+    XdNoData
   },
   props: {
     getCityInfoByLocation: {
@@ -102,26 +111,49 @@ export default {
 <style lang="less" scoped>
   .chose_shop_list{
     background: #F7F7F7;
-    padding: 32rpx;
+    padding: 0 16rpx 16rpx;
     position: relative;
-    height: calc(60vh - 164rpx);
+    height: 45vh;
   }
-
-  .shop-search {
+  .shop_header{
     position: absolute;
-    border:1px solid #eee;
     top: -80rpx;
-    left: 30rpx;
-    width: 400rpx;
-    padding: 10rpx 20rpx;
+    left: 8rpx;
+    display: flex;
+    ::v-deep .xd-city__name-title{
+      color: #999999 !important;
+      font-size: 24rpx !important;
+    }
+    ::v-deep .xd-city__name-icon{
+      color: #999999 !important;
+
+      .xd-iconfont {
+        font-size: 24rpx !important;
+      }
+    }
+  }
+  .shop-search {
+    border:1px solid #f8f8f8;
+    width: 420rpx;
+    padding: 16rpx 32rpx;
     border-radius: 40rpx;
     background-color: #f8f8f8;
     display: flex;
     justify-content: flex-start;
     align-items: center;
+    margin-left: 8rpx;
+
+    // #ifdef MP-WEIXIN
+    padding: 8rpx 32rpx;
+    // #endif
+
+    ::v-deep .uni-input-placeholder{
+      color: #999999;
+    }
+    
 
     & .uni-input {
-      font-size: 28rpx;
+      font-size: 24rpx;
       flex: 1;
       color: #333;
       line-height: 36rpx;
@@ -155,23 +187,25 @@ export default {
     font-size: 28rpx;
   }
   .empty_data{
-    line-height: 300rpx;
     text-align: center;
     font-size: 28rpx;
     color: #999999;
+    height: 100%;
   }
   .shop_list{
-    height: calc(60vh - 164rpx);
+    height: 100%;
     overflow-y: auto;
+    padding-top: 16rpx;
     .shop_item{
       display: flex;
       background: #FFFFFF;
-      padding: 20rpx;
+      padding: 16rpx;
       margin-bottom: 20rpx;
+      border-radius: 16rpx;
     }
     .shop_image{
-      width: 200rpx;
-      height: 200rpx;
+      width: 160rpx;
+      height: 160rpx;
       border: 1px solid #DDD;
       image{
         width: 100%;
@@ -183,15 +217,22 @@ export default {
       flex-direction: column;
       width: 200rpx;
       flex: 1;
-      margin-left: 24rpx;
-      justify-content: space-between;
+      margin-left: 16rpx;
+
+      .addr_text{
+        width: 420rpx;
+        padding-right: 20rpx;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
     }
     .shop_name{
       display: flex;
       align-items: flex-start;
       justify-content: space-between;
       font-size: 32rpx;
-      color: #242424;
+      color: #333333;
       ._name{
         flex: 1;
         width: 200rpx;
@@ -207,9 +248,10 @@ export default {
     }
     .shop_sub{
       display: flex;
+      align-items: center;
       color: #999999;
       font-size: 24rpx;
-      margin-top: 20rpx;
+      margin-top: 16rpx;
       line-height: 1.6;
       ._icon{
         width: 40rpx;

package/src/components/JfbMallNetworkMedia/Api.js

@@ -0,0 +1,94 @@
+'use strict';
+/**
+ * @description  接口配置，
+ * 在设置方法名字当时候，别忘记加上【模块名字】：Network
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    mapFnName: "getMallMediaProductContent",
+    title: "获取商品内容",
+    path: "/product/v1/:xnamespace/product/item/:product_id/content",
+    isRule: false,
+    params: {
+      xnamespace: ['xnamespace', 'string', '必选'],
+      product_id: ['product_id', 'string', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: "getMallMediaProductBuyButton",
+    title: "获取商品下单按钮",
+    path: "/product/v1/:xnamespace/product/item/:product_id/buy-button",
+    isRule: false,
+    params: {
+      xnamespace: ['xnamespace', 'string', '必选'],
+      product_id: ['product_id', 'string', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: "getMallMediaProductForm",
+    title: "单个表单数据",
+    path: "/product/v1/:xnamespace/product/item/:product_id/form-data",
+    isRule: false,
+    params: {
+      xnamespace: ['xnamespace', 'string', '必选'],
+      product_id: ['product_id', 'string', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'getMallMediaProductList',
+    title: '获取商品列表',
+    path: '/product/v1/:xnamespace/product/search',
+    isRule: false,
+    params: {
+      xnamespace: ['path', "xnamespace", "必选"],
+      sort: ['排序', 'string', '必选'],
+      keyword: ['关键词', 'string', '必选'],
+      brand_ids: ['品牌ID，多个小写逗号隔开', 'string', '必选'],
+      filter_keys: ['过滤KEY,多个逗号隔开', 'string', '必选'],
+      city_code: ['城市CODE', 'string', '必选'],
+      custom_category_id: ['自定义分类ID', 'string', '必选'],
+      market_tags: ['营销标签 rec=推荐, hot=爆款, new=新品 多个逗号隔开', 'string', '必选'],
+      random_score_seed: ['随机排序因子, 分页时保证一样', 'string', '必选'],
+      page_size: ['page_size', 'string', '必选'],
+      page_token: ['page_token', 'string', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'getMallMediaCategoryTree',
+    title: '分类 - 树列表',
+    path: '/product/v1/:xnamespace/category/tree',
+    isRule: false,
+    params: {
+      xnamespace: ['xnamespace', 'String', '必选'],
+      level: ['获取几层数据，默认：2', 'Number', '必选', 2],
+      root_category_id: ['父级分类，默认：0', 'Number', '必选', 0],
+      tag: ['分类标签', 'String', '选填']
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: "nowMallMediaBuyPay",
+    title: "立即购买",
+    path: "/cart/v1/buy",
+    isRule: false,
+    data: {
+      namespace: ['namespace', 'String', '必选'],
+      product: {
+        product_id: ['商品Id', 'Number', true],
+        num: ['数量', 'Number', true, 1]
+      }
+    },
+    isConsole: true,
+    disabled: true
+  },
+];

package/src/components/JfbMallNetworkMedia/Attr.js

@@ -0,0 +1,20 @@
+'use strict';
+
+import content from "./cusAttr/content";
+import style from "./cusAttr/style";
+import advanced from "./cusAttr/advanced";
+
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
+export default {
+  style: [],
+  content: (data, gValue, gColor, oldData={}) => {
+    return [
+      ...content(data, gValue, gColor, oldData),
+      ...style(data, gValue, gColor, oldData),
+      ...advanced(data)
+    ].filter(i=>i)
+  },
+  advanced: [],
+};