d

app.js

@@ -137,8 +137,8 @@ App({
     fromUserId : '',//分享者的id
     fromUserRole : '',//分享者的role
     //servsers: "https://52yqf.cn/",
-    // servsers: "https://www.daliangzao.net/",//正式库
-    servsers: "https://dlz.info666.com/",//测试域名库
+    servsers: "https://www.daliangzao.net/",//正式库
+    // servsers: "https://dlz.info666.com/",//测试域名库
     //servsers: "https://tt.daliangzao.net/",//测试库
     appid: 'wxf9a0ddcb8c70b939',//appid
     secret: 'a009cb3e46c8ecef9c54a50522f11823',//secret

customized/pages/index/index.js

@@ -9,12 +9,12 @@ Page({
    */
   data: {
     Length: 6, //输入框个数
-    isFocus: true, //聚焦
     Value: "", //输入的内容
     ispassword: true, //是否密文显示 true为密文， false为明文。
     pwdStatic: false, // 密码状态框，是否显示
     carNum: null,
     host: host,
+    keyboard:[[1,2,3],[4,5,6],[7,8,9]],
     madeList: [
       // {
       // src:'/customized/images/customized/cup_black_small.png',
@@ -185,35 +185,49 @@ Page({
       pwdStatic: true
     })
   },
-  Focus(e) {
-    var that = this;
-    console.log(e.detail.value);
-    var inputValue = e.detail.value;
-    that.setData({
-      Value: inputValue,
-    })
-  },
+ 
   Tap() {
     var that = this;
     that.setData({
       isFocus: true,
     })
   },
-  fromDel() {
+  close() {
     this.setData({
-      Value: "",
+      pwdStatic: false,
+      Value:""
     })
   },
-  formSubmit(e) {
-    console.log(this.data.Value);
-    this.getMadeList(this, {
-      channalPwd: this.data.Value
+  keyboard(e){
+    let num = e.currentTarget.dataset.num,
+      that = this,
+      Value = that.data.Value;
+    console.log(that.data.Value.length,"长度")
+    if (Value.length < 6){
+      Value += num;
+    }
+    that.setData({
+      Value: Value,
     })
+    if (that.data.Value.length >= 6){
+      that.close();
+      setTimeout(()=>{
+        that.getMadeList(that, {
+          channalPwd: Value
+        })
+      },200)
+      
+      
+    }
+    
+    console.log(that.data.Value)
   },
-  close() {
-    this.setData({
-      pwdStatic: false
+  keyboardDel(){
+    let that = this;
+    that.setData({
+      Value: that.data.Value.substring(0, that.data.Value.length-1)
     })
+    console.log(that.data.Value)
   }
 
 })

customized/pages/index/index.wxml

@@ -45,20 +45,26 @@
 
 
 <!-- 密码输入框 -->
-<view class='pwd-box' bindtap='close' wx:if="{{pwdStatic}}">
-<view class='pwd-main'>
+<view class='pwd-box' catchtap='close' wx:if="{{pwdStatic}}"></view>
+<view class='pwd-main' wx:if="{{pwdStatic}}">
 <view class='f-s32 pwd-title mar-b20'>请输入密码</view>
 <view class='f-box content'>
   <block wx:for="{{Length}}" wx:key="item">
     <input class='iptbox' value="{{Value.length>=index+1?Value[index]:''}}" disabled password='{{ispassword}}' catchtap='Tap'></input>
   </block>
 </view>
-  <input name="password" password="{{true}}" value='{{Value}}' class='ipt' maxlength="{{Length}}" focus="{{isFocus}}" auto-focus="true" bindinput="Focus" style='display:none'></input>
-  <view class='f-box btn-box'>
-    <view class="btn-area f-s32 btn-del" bindtap='fromDel'>删除</view>
-    <view class="btn-area f-s32 bg-green c-white" bindtap='formSubmit'>确定</view>
+  <!-- 虚拟键盘 -->
+  <view class='keyboard-box'>
+    <text class='f-box f-justify-content-center f-s30 mar-b20'>安全键入键盘</text>
+    <view class='f-box keyboard-row' wx:for='{{keyboard}}'>
+      <view class='f-item keyboard-grid' wx:for='{{item}}' wx:for-item='itemName' data-num='{{itemName}}' bindtap='keyboard'>{{itemName}}</view>
+    </view>
+    <view class='f-box keyboard-row'>
+      <view class='f-item keyboard-grid' data-num='.' bindtap='keyboard'>.</view>
+      <view class='f-item keyboard-grid' data-num='0' bindtap='keyboard'>0</view>
+      <view class='f-item keyboard-grid' data-num='del' bindtap='keyboardDel'>del</view>
+    </view>
   </view>
   </view>
-</view>
 
 

customized/pages/index/index.wxss

@@ -85,11 +85,12 @@ page{
 }
 .pwd-main{
   /* height:300rpx; */
-  padding:50rpx 0;
+  padding:30rpx 0 0;
   width:100%;
   position:fixed;
-  margin-top:150rpx;
+  bottom:0;
   background:#fff;
+  z-index:111;
 }
 .content{
   width:612rpx;
@@ -134,4 +135,23 @@ page{
 }
 .footer-box{
   background:none;
+}
+.keyboard-box{
+  margin-top:40rpx;
+}
+.keyboard-row{
+  height:120rpx;
+  font-size:48rpx;
+  text-align: center;
+  line-height:120rpx;
+  border-top:2rpx solid #e0e0e0;
+}
+.keyboard-grid{
+  border-right:2rpx solid #e0e0e0;
+}
+.keyboard-grid:last-child{
+  border-right:none;
+}
+.keyboard-row .f-item{
+  width:200%;
 }

customized/pages/made/comb/comb.wxss

@@ -8,7 +8,7 @@ page{
 }
 .comb-img{
   width:334rpx;
-  height:334rpx;
+  height:450rpx;
 }
 .comb-font,.comb-font4,.comb-font3{
   width:218rpx;

newsShop/pages/kind/index.js

@@ -1,176 +1,122 @@
 // index.js
 //获取应用实例
 var app = getApp();
+let host = app.globalData.servsers; // 请求的url
 Page({
   data: {
-    urlHttp: '',
-    contentList:[],
-    command:'', //口令
-    commandNeibu:'',
-    commandPlaceholder: '请输入口令',
-    showVip : false,
-    showNeiBu:false,
-    hiddenmodal : true  //显示提示弹窗
+    host:host,
+    classifyNavList:[],
+    classifyNavActiveId: 2981,
+    goodsList:[],
+    commodity_levelTwo:null,
+    requestState:true, //默认为true,表示还有数据
+    page:0,
+    filterArray: [
+      { name: '1', value: '0~499元' },
+      { name: '2', value: '500~999元'},
+      { name: '3', value: '1000~1999元' },
+      { name: '4', value: '2000元以上' },
+    ],
+    filterStatic:false,
+    isNew:true,
+    isMin:true,
   },
-  onLoad: function () {
-    var that = this;
-    var host = getApp().globalData.servsers;
-    that.setData({
-      urlHttp: host
-    });
-    wx.request({
-      url: host+"classifyapi/findAllforhome",
-      data: {},
-      method: 'GET', // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT
-      header: {
-        'Accept': 'application/json'
-      },
-
-      success: function (res) {
-        that.setData({
-          contentList: res.data.rows
-        });
-        console.log(res.data.rows);
-        if (res == null || res.data == null) {
-          console.error('网络请求失败');
-          return;
-        }
-      }
-    })
+  onLoad(){
+    this.getNavList(this);
+    this.getGoodsListAllfor(this)
   },
+  onShow(){
 
-  //下拉刷新
-  onPullDownRefresh: function (e) {
-    this.onLoad();
-    wx.stopPullDownRefresh();
   },
-
-  //打开VIP弹窗
-  openVipWind:function(e){
-    var that = this;
-    that.setData({
-      showVip: true
-    })
-  },
-
-  //关闭VIP弹窗
-  closeVipWind:function(e){
-    var that = this;
-    that.setData({
-      showVip: false
-    })
+  onReachBottom: function () {
+    if (this.data.requestState) {
+      this.setData({
+        page: this.data.page + 1
+      })
+      this.getGoodsList(this)
+    }
+    console.log('到底了')
   },
-
-
-
-  //口令
-  commandInput: function (e) {
-    this.setData({
-      command: e.detail.value
+  getNavList(that){
+    wx.request({
+      url: host + '/classifyapi/findAllforhome',
+      method:'get',
+      success(res){
+        console.log(res,"成功后的")
+        that.setData({
+          classifyNavList:[...res.data.rows]
+        })
+      }
     })
   },
-
-  commandInputFocus:function(e){
-    var that = this;
+  classifyTap(e){
+    console.log(e,"classifyTap")
+    let item = e.currentTarget.dataset.item,that = this;
     that.setData({
-      commandPlaceholder : ''
+      classifyNavActiveId:item.id,
+      requestState: true, //数据初始化
+      page: 0,//数据初始化
+      goodsList: []//数据初始化
     })
+    that.getGoodsListAllfor(that)
+    
   },
-
-  //vip - 立即进入
-  comeInVip:function(e){
-    var that = this;
-    var command = that.data.command;
-    if (command != 'VIPBYU'){
-      that.setData({
-        hiddenmodal: false,
-        modalCont: '输入口令有误！请重新输入口令',
-      })
-      setTimeout(function () {
+  getGoodsListAllfor(that){
+    wx.request({
+      url: host +'/classifyapi/findAllforviewSce',
+      method:'get',
+      data:{
+        id:that.data.classifyNavActiveId
+      },
+      success(res){
         that.setData({
-          hiddenmodal: true,
-          commandPlaceholder: '请输入口令'
-        })
-      }, 1000)
-      return false;
-    }else{
-
-      that.setData({
-        showVip: false,
-        command : '',
-        commandPlaceholder: '请输入口令'
-      })
-      setTimeout(function () {
-        wx.navigateTo({
-          url: '/pages/kindSecondList/kindSecondList?classify_name=VIP专区&classify_des=大良造VIP专区&id=2998',
+          commodity_levelTwo:res.data.rows[0].id,
         })
-      }, 50)
-    }
+        that.getGoodsList(that)
+      }
+    })
   },
-
-
-  //打开内部员工弹窗
-  openNeibuWind: function (e) {
-    var that = this;
-    that.setData({
-      showNeibu: true
+  getGoodsList(that){
+    let goodsList = that.data.goodsList, requestState = true
+    wx.request({
+      url: host + '/commodityapi/commoditviewfoeeverybody?commodity_levelTwo=2983&offset=0&limit=10',
+      method:'get',
+      data:{
+        commodity_levelTwo: that.data.commodity_levelTwo,
+        offset:that.data.page,
+        limit:10,
+      },
+      success(res){
+        console.log(res)
+        res.data.rows.length < 10 ? requestState = false : requestState = true
+        goodsList.push(...res.data.rows)
+        that.setData({
+          goodsList: goodsList,
+          requestState: requestState
+        })
+      }
     })
   },
-
-  //关闭内部员工弹窗
-  closeNeibuWind: function (e) {
-    var that = this;
+  filterTap(){
+    let that = this;
     that.setData({
-      showNeibu: false
+      filterStatic: !that.data.filterStatic
     })
   },
-
-  //内部员工口令
-  commandNeibuInput: function (e) {
+  newTap(){
     this.setData({
-      commandNeibu: e.detail.value
+      isNew:!this.data.isNew
     })
   },
-
-  commandNeibuInputFocus: function (e) {
-    var that = this;
-    that.setData({
-      commandPlaceholder: ''
+  priceTap() {
+    this.setData({
+      isMin: !this.data.isMin
     })
   },
+  close(){
+    this.setData({
+      filterStatic:false
+    })
+  }
 
-  //内部员工 - 立即进入
-  comeInNeibu: function (e) {
-    var that = this;
-    var commandNeibu = that.data.commandNeibu;
-    if (commandNeibu != 'maineibu') {
-      that.setData({
-        hiddenmodal: false,
-        modalCont: '输入口令有误！请重新输入口令',
-      })
-      setTimeout(function () {
-        that.setData({
-          hiddenmodal: true,
-          commandPlaceholder: '请输入口令'
-        })
-      }, 1000)
-      return false;
-    } else {
-
-      that.setData({
-        showNeibu: false,
-        commandNeibu: '',
-        commandPlaceholder: '请输入口令'
-      })
-      setTimeout(function () {
-        wx.navigateTo({
-          url: '/pages/kindSecondList/kindSecondList?classify_name=内部购买&classify_des=古德内部员工购买&id=3000&flag=0',
-        })
-      }, 50)
-    }
-  },
-
-
-})
-var that;
-var Util = require('../../utils/util.js'); 
+})

newsShop/pages/kind/index.json

@@ -1,7 +1,7 @@
 {
-  "navigationBarTitleText": "分类列表",
-
-  "enablePullDownRefresh": true
-
-
+  "navigationBarTitleText": "分类",
+  "usingComponents": {
+    "data-none": "/components/data-none/data-none",
+    "divider": "/components/divider/divider"
+  }
 }

newsShop/pages/kind/index.wxml

@@ -1,79 +1,95 @@
-<!--index.wxml  分类列表  -->
-<view class="container">
-
-    <view class="list">
-      <block wx:for="{{contentList}}" wx:key="{{index}}"> 
-        <block wx:if="{{item.id != 2998 && item.id != 2999}}">
-        <navigator url="/pages/kindSecondList/kindSecondList?classify_name={{item.classify_name}}&classify_des={{item.classify_des}}&id={{item.id}}"  class="list_item_wrap">
-          <view class="list_item">
-            <image src="{{item.classify_logo}}" class="full_image"  />
-          </view>        
-        </navigator>
-        </block>
-        <block wx:if="{{item.id == 2998}}">
-          <view  class="list_item_wrap"  bindtap='openVipWind'>
-            <view class="list_item">
-              <image src="{{item.classify_logo}}" class="full_image"  />
-            </view> 
+<view class='classify-box'>
+  <!-- 头部搜索 -->
+  <view class='header'>
+    <view class='header-box'>
+    <view class='auto f-box'>
+    <image class='mar-r20' src='../../images/news/l_icon.png' mode="aspectFit"></image>
+      <view class='f-item f-box f-align-items-center h-search mar-t20 mar-b20'>
+        <icon class='iconfont icon-sousuo'></icon>
+        <input placeholder='输入搜索关键词' class='f-s26'></input>
+      </view>
+    </view>
+      
+    </view>
+  </view>
+  <!-- 内容模块 -->
+  <view class='classify-main f-box'>
+    <!-- left nav -->
+    <view class='class-left'>
+      <view class='nav'>
+        <view class='nav-list f-box f-align-items-center f-justify-content-center {{item.id === classifyNavActiveId ? "active" : ""}}' wx:for="{{classifyNavList}}" data-item="{{item}}" bindtap='classifyTap'>{{item.classify_name}}</view>
+      </view>
+    </view>
+    <!-- right content -->
+    <view class='class-right f-item'>
+      <!-- 筛选-->
+      <view class='filter-box'>
+        <view class='f-box'>
+          <view class='f-item f-box f-align-items-center f-justify-content-center' bindtap='newTap'>
+            <text>最新</text>
+            <view class='icon-box'>
+              <icon class='iconfont .icon-icon_sanjiaoxing-copy {{isNew ? "active" : ""}}'></icon>
+              <icon class='iconfont .icon-icon_sanjiaoxing {{isNew ? "" : "active"}}'></icon>
+            </view>
           </view>
-        </block>
-        <block wx:if="{{item.id == 2999}}">
-          <view  data-id="{{item.id}}"  class="list_item_wrap" bindtap='openNeibuWind'>
-            <view class="list_item">
-              <image src="{{item.classify_logo}}" class="full_image"  />
-            </view> 
+          <view class='f-item f-box f-align-items-center f-justify-content-center' bindtap='priceTap'>
+            <text>价格</text>
+            <view class='icon-box'>
+              <icon class='iconfont .icon-icon_sanjiaoxing-copy {{isMin ? "active" : ""}}'></icon>
+              <icon class='iconfont .icon-icon_sanjiaoxing {{isMin ? "" : "active"}}'></icon>
+            </view>
           </view>
-        </block>
-      </block>
-    </view>  
-
-     <!-- <image src='/images/kind_bg.png' mode='widthFix'  class='kind_bg'></image>  -->
+          <view class='f-item f-box f-align-items-center f-justify-content-center' bindtap='filterTap'>
+            <text>筛选</text>
+            <view class='icon-box icon-last'>
+              <icon class='iconfont .icon-icon_sanjiaoxing {{filterStatic ? "active" : ""}}'></icon>
+            </view>
+          </view>
+        <!-- 筛选内容 -->
+        <view class='filter-main' wx:if="{{filterStatic}}">
+          <!-- 第一块内容 -->
+          <view class='filter-frist'>
+            <radio-group class="radio-group" bindchange="radioChange">
+              <label class="radio" wx:for="{{filterArray}}">
+                <radio value="{{item.name}}" color='#e60012' />
+                {{item.value}}
+              </label>
+            </radio-group>
+          </view>
+          <view class='filter-next'>
+            <view class='filter-next-title'>价格区间(元)</view>
+            <view class='f-box filter-range'>
+              <view class='f-item'>
+                <input placeholder='最低价'></input>
+              </view>
+               <view class='f-item'>——</view>
+               <view class='f-item'>
+                <input placeholder='最高价'></input>
+              </view>
+            </view>
+          </view>
+        </view>
+        
+      </view>
+      </view>
+      
 
-</view>
 
-<!-- vip弹窗 -->
-<view class='vip_wind_wrap  {{showVip ? "" : "hidden"}}'>
-  <view class='vip_content'>
-   <view class='vip_cont'>
-    <image wx:if="{{urlHttp}}" src='{{urlHttp}}images/vip_icon_bg.png'  class='vip_bg'></image>
-    <!-- input -->
-    <view class='input_cont_wrap'>
-      <view class='input_wrap'>
-        <image src='/images/vip_input_bg.png'  class='vip_input_bg'></image>
-        <input type='text'   placeholder='{{commandPlaceholder}}'  class='input_inp'  value="{{command}}"  placeholder-class="input_placeholder"  bindinput ="commandInput"  bindfocus="commandInputFocus"></input>
-        <view class='input_btn'  bindtap='comeInVip'>立即进入</view>
+      <!-- goodsList -->
+      <view class='goods-box '>
+      <view class='f-box f-flex-wrap f-justify-content-between'>
+        <view class='goods-list' wx:for="{{goodsList}}">
+          <image src='{{item.commodity_logo}}' class='goods-img' mode='aspectFit'></image>
+          <!-- <view class='goods-summary'></view> -->
+          <view class='goods-title'>{{item.commodity_name}}</view>
+          <view class='goods-price'>￥{{item.commodity_sale}}</view>
+        </view>
       </view>
-    </view>
-    <image wx:if="{{urlHttp}}" src='{{urlHttp}}images/vip_icon_right.png' class='vip_bg_icon'></image>
-   </view>
-   <view class='close_vip_wind'  bindtap='closeVipWind'>
-    <image src='/images/vip_close_icon.png' class='close_icon'></image>
-   </view>
-  </view>
-</view>
-
-<!-- 内部员工弹窗 -->
-<view class='vip_wind_wrap  {{showNeibu ? "" : "hidden"}}'>
-  <view class='vip_content'>
-   <view class='vip_cont'>
-    <image wx:if="{{urlHttp}}" src='{{urlHttp}}images/neibu_icon_bg.png'  class='vip_bg'></image>
-    <!-- input -->
-    <view class='input_cont_wrap'>
-      <view class='input_wrap'>
-        <image src='/images/vip_input_bg.png'  class='vip_input_bg'></image>
-        <input type='text'   placeholder='{{commandPlaceholder}}'  class='input_inp'  value="{{commandNeibu}}"  placeholder-class="input_placeholder"  bindinput ="commandNeibuInput"  bindfocus="commandNeibuInputFocus"></input>
-        <view class='input_btn'  bindtap='comeInNeibu'>立即进入</view>
+      <divider wx:if="{{!requestState}}"></divider>
+      <data-none wx:if="{{goodsList.length === 0}}"></data-none>
       </view>
+       
     </view>
-    <image wx:if="{{urlHttp}}" src='{{urlHttp}}images/vip_icon_right.png' class='vip_bg_icon'></image>
-   </view>
-   <view class='close_vip_wind'  bindtap='closeNeibuWind'>
-    <image src='/images/vip_close_icon.png' class='close_icon'></image>
-   </view>
   </view>
 </view>
-
-<!-- 提示弹窗 -->
-<view class="modal_wrap  {{hiddenmodal ? 'hidden' : ''}}">
-  <view class="modal  {{hiddenmodal ? 'hidden' : ''}}">{{modalCont}}</view>
-</view>
+<view class='ceng' bindtap='close' wx:if="{{filterStatic}}"></view>

newsShop/pages/kind/index.wxss

@@ -1,168 +1,155 @@
-/* index.wxss */
 page{
-  background-color: #fff;
+  background:#fff;
 }
-/*  列表 */
-.list_item_wrap{
-  display: block;
-  width: 50%;
-  height: 25%;
-  box-sizing: border-box;
-}
-.list_item_wrap:nth-child(odd){
-  border-right:2rpx solid #fff;
-}
-.list_item_wrap:nth-child(even){
-  border-left:2rpx solid #fff;
-}
-.list{
-  width: 100%;
-  height: 100vh;
-  display: flex;
-  justify-content: space-between;
-  flex-wrap: wrap;
-  background-color: transparent;
-}
-.list_item{
-  width: 100%;
-  height: 100%;
-  box-sizing: border-box;
-  border-bottom: 4rpx solid #fff;
-}
-.list_item_wrap:nth-last-child(1) .list_item,.list_item_wrap:nth-last-child(2) .list_item{
-  border-bottom: 0px solid #fff;
-}
-.full_image{
-  display: block;
-  width: 100%;
-  height: 100%;
-}
-.kind_bg{
-  display: block;width: 100%;
-}
-
-/*  新版本样式  */
-.container{
-  background-color: #fff;
+.header{
+  padding-top:88rpx;
 }
-.kind_top_wrap{
-  padding: 0 30rpx 40rpx;
-}
-.kind_top_each{
-  display: block;
-  float: left;
-  width: 25%;
-  margin: 40rpx 0 0 0;
+.header-box{
+  border-bottom:2rpx solid #e0e0e0;
+  position: fixed;
+  width:100%;
+  top:0;
+  left:0;
+  background: #FFF;
+  z-index:10000;
+}
+.header image{
+  width:70rpx;
+  height:70rpx;
+  margin-top:10rpx;
+}
+.h-search{
+  height:50rpx;
+  line-height:50rpx;
+  background:#e5e5e5;
+  border-radius:50rpx;
+}
+.h-search .iconfont{
+  padding-left:10rpx;
+}
+.h-search input{
+  padding:0 10rpx;
+  height:50rpx;
+  line-height:50rpx;
+}
+/* left */
+.class-left{
+  padding-left:172rpx;
+}
+.class-left .nav{
+  position:fixed;
+  left:0;
+  background:#fff;
+  height:100%;
+  width:170rpx;
+  border-right:2rpx solid #e0e0e0;
+  z-index:100;
+}
+.nav-list{
+  height:54rpx;
+  margin:25rpx 0;
+  width:150rpx;
+  margin-right:10rpx;
   text-align: center;
+  border-left:10rpx solid #fff;
 }
-.kind_top_each_img{
-  width: 53rpx;
-  height: 48rpx;
-  margin: 0 auto;
+.nav-list.active{
+  color:#e60012;
+  border-color:#e60012;
 }
-.kind_top_each_tit{
-  font-size: 22rpx;
-  color: #454545;
-  padding: 15rpx 0 0 0;
+.filter-box {
+  height:70rpx;
+  line-height:70rpx;
+  background:#fff;
+  border-bottom:2rpx solid #e0e0e0;
+  position: relative;
+  z-index:100;
 }
-.kind_center_img{
-  width: 100%;
-  margin-bottom: 20rpx;
+.icon-box{
+  color:#dcdcdc;
+  line-height:40rpx;
+  height:40rpx;
+  position: absolute;
+  top:-8rpx;
+  margin-left:1.1rem;
 }
-.kind_footer_each{
-  float: left;
+.icon-box icon{
+  display:block;
+  height:16rpx;
+  line-height:16rpx;
 }
-.kind_footer_each_img{
-  width: 250rpx;
-  height: 250rpx;
+.icon-box icon.active{
+  color:#333;
 }
-.kind_footer_each_tit,.kind_footer_each_price{
-  text-align: center;
-  font-size: 22rpx;
-  color: #232323;
+.icon-last{
+  top:2rpx;
 }
-.kind_footer_each_tit{
-  padding: 10rpx 0 18rpx 0;
+.radio-group .radio{
+  line-height:50rpx;
+  display:inline-block;
+  width:40%;
 }
-/* vip弹窗 */
-.vip_wind_wrap{
-  width: 100%;
-  height: 100%;
-  position: fixed;
-  top: 0;
-  left: 0;
-  z-index: 99;
-  background-color: rgba(0,0,0,0.6);
+.radio-group .radio radio{
+transform:scale(0.6);
+width:40rpx;
 }
-.vip_content{
+.filter-box{
   position: fixed;
-  top:0;
-  left:50%;
-  margin:0 0 0 -254rpx;
-}
-.vip_cont{
-  position: relative;
-}
-.vip_bg{
-  display: block;
-  width: 508rpx;
-  height: 662rpx;
-  margin: 0 auto;
-}
-.vip_bg_icon{
-  display: block;
-  width: 190rpx;
-  height: 168rpx;
-  position: absolute;
-  right: -100rpx;
-  bottom: -60rpx;
-}
-/* input */
-.input_cont_wrap{
-  position: absolute;
-  left: 56rpx;
-  bottom: 26rpx;
-}
-.vip_input_bg{
-  display: block;
-  width: 390rpx;
-  height: 104rpx;
+  width:580rpx;
+  background:#fff;
+}
+.filter-main{
+  padding:20rpx;
+  background:#fff;
+  position:absolute;
+  top:72rpx;
+}
+.filter-range{
+  width:400rpx;
+  line-height:48rpx;
+}
+.filter-range input{
+  width:150rpx;
+  background:#eeedf2;
+  height:48rpx;
+  border-radius:48rpx;
+  text-align: center;
 }
-/* input */
-.input_wrap{
-  position: relative;
+.goods-box {
+  margin:90rpx 20rpx 20rpx 20rpx;
 }
-.input_inp{
-  width: 330rpx;
-  height: 66rpx;
-  position: absolute;
-  top:20rpx;
-  left: 30rpx;
-  font-size: 24rpx;
-  color: #969696;
-  text-align: center;
-  border: 0px none;
-}
-.input_placeholder{
-  font-size: 24rpx;
-  color: #969696;
-}
-.input_btn{
-  width: 140rpx;
-  height: 38rpx;
-  font-size: 20rpx;
-  line-height: 40rpx;
-  color: #fff;
-  background-color: #654a36;
-  text-align: center;
-  border-radius: 4px;
-  box-shadow: 0 3px 0 0 #422d1e;
-  margin: 16rpx auto 0;
+.goods-list{
+  width:246rpx;
+  margin-bottom:30rpx;
 }
-/* 关闭弹窗按钮 */
-.close_icon{
+.goods-img{
+  width:246rpx;
+  height:246rpx;
+  background:#eeedf2;
   display: block;
-  width: 58rpx;
-  height: 58rpx;
-  margin: 143rpx auto 0;
 }
+.goods-summary{
+  height:44rpx;
+  line-height:44rpx;
+  background:#f1f7fc;
+  color:#666666;
+  padding:0 10rpx;
+  overflow: hidden;/*超出部分隐藏*/
+  white-space: nowrap;/*不换行*/
+  text-overflow:ellipsis;/*超出部分文字以...显示*/
+}
+.goods-title{
+  margin:10rpx 0;
+}
+.goods-price{
+  color:#e60012;
+}
+.ceng{
+  position:fixed;
+  width:100%;
+  height:100%;
+  background:rgba(0,0,0,0.6);
+  z-index:10;
+  top:0;
+  left:0;
+}

newsShop/pages/mine/mine.js

@@ -4,41 +4,7 @@ Page({
   data: {
     userId : '',
     userInfo: {},
-    phone:'',
-    hidden : 'hidden',
-    userListInfo1: [{
-      icon: '/images/mine_order.png',
-      text: '我的订单',
-      url:"/pages/orderList/orderList?isSelect=1"
-    }, {
-      icon: '/images/mine_collect.png',
-      text: '我的收藏',
-      addclass:"no_border",
-      url: "/pages/mineCollect/mineCollect"
-    }],
-
-    userListInfo2: [
-    {
-      icon: '/images/mine_coupon.png',
-      text: '优惠券',
-      addclass: "no_border",
-      url: "/pages/mineCoupon/coupon"
-    }],
-    userListInfo3: [{
-      icon: '/images/mine_address.png',
-      text: '我的地址',
-      url: "/pages/mineAddress/mineAddress"
-    }, {
-      icon: '/images/mine_help.png',
-      text: '帮助及意见反馈',
-      addclass: "no_border",
-      url: "/pages/problemList/problemList"
-    }],
-
-    userRole : 0, //用户身份【普通用户 / 商务用户】
-    hiddenmodal: true, //提示弹窗
-    modalCont: '', //提示内容
-
+    phone:''
   },
 
   onLoad: function () {
@@ -106,97 +72,4 @@ Page({
     })
   },
 
-
-
-  //我的订单
-  linkOrder: function () {
-    var that = this;
-    var un_id = getApp().globalData.un_id;
-    var openid = getApp().globalData.openid;
-    if ((un_id == undefined || un_id == '' || un_id == null) || (openid == undefined || openid == '' || openid == null)){
-      wx.navigateTo({
-        url: '/pages/authorize/authorize?link=orderList',
-      })
-    }else{
-      wx.navigateTo({
-        url: '/pages/orderList/orderList?isSelect=0'
-      })
-    }
-  },
-
-  //我的礼物
-  linkGift: function () {
-    var that = this;
-    var un_id = getApp().globalData.un_id;
-    var openid = getApp().globalData.openid;
-    if ((un_id == undefined || un_id == '' || un_id == null) || (openid == undefined || openid == '' || openid == null)) {
-      wx.navigateTo({
-        url: '/pages/authorize/authorize?link=mineGiftList',
-      })
-    } else {
-      wx.navigateTo({
-        url: '/pages/mineGiftList/mineGiftList'
-      })
-    }
-  },
-
-  //我的地址
-  linkAddress: function () {
-    var that = this;
-    var un_id = getApp().globalData.un_id;
-    var openid = getApp().globalData.openid;
-    if ((un_id == undefined || un_id == '' || un_id == null) || (openid == undefined || openid == '' || openid == null)) {
-      wx.navigateTo({
-        url: '/pages/authorize/authorize?link=mineAddress',
-      })
-    } else {
-      wx.navigateTo({
-        url: '/pages/mineAddress/mineAddress'
-      })
-    }
-  },
-
-  //我的收藏
-  linkCollect: function () {
-    var that = this;
-    var un_id = getApp().globalData.un_id;
-    var openid = getApp().globalData.openid;
-    if ((un_id == undefined || un_id == '' || un_id == null) || (openid == undefined || openid == '' || openid == null)) {
-      wx.navigateTo({
-        url: '/pages/authorize/authorize?link=mineCollect',
-      })
-    } else {
-      wx.navigateTo({
-        url: '/pages/mineCollect/mineCollect'
-      })
-    }
-  },
-
-  //下拉刷新
-  onPullDownRefresh: function (e) {
-    var that = this;
-    that.onLoad();
-    wx.stopPullDownRefresh();
-  },
-
-  //我的收益
-  mineEarnings:function(e){
-    var that = this;
-    var userRole = that.data.userRole;
-    wx.navigateTo({
-      url: '/pages/jianshe/jianshe',
-    })
-
-    // if (userRole == 0){//普通用户
-    //   wx.navigateTo({
-    //     url: '/pages/partnerMineEarnings/partnerMineEarnings',
-    //   })
-    // }else{
-    //   wx.navigateTo({
-    //     url: '/pages/partnerBusinessEarnings/partnerBusinessEarnings',
-    //   })
-    // }
-  }
-})
-var that;
-var Util = require('../../utils/util.js'); 
+})

newsShop/pages/mine/mine.json

@@ -1,4 +1,3 @@
 {
-  "navigationBarTitleText": "我的",
-  "enablePullDownRefresh": true
+  "navigationBarTitleText": "我的"
 }

newsShop/pages/mine/mine.wxml

@@ -1,100 +1,64 @@
 <!--index.wxml-->
-<view class="container  {{hidden}}">
-  <view  bindtap="bindViewTap" class="userinfo">
-
-    <block  wx:if="{{userInfo.avatarUrl}}">
-        <image class="userinfo-avatar"   src="{{userInfo.avatarUrl}}"></image> 
-    </block>
-    <block wx:else>
-        <image class="userinfo-avatar"   src="/images/def_photo.png"></image> 
-    </block>
-    
-    <view class="userinfo-nickname">{{userInfo.nickName}}</view>
-
-    <!-- 用户身份 -->
-    <!-- <view class='user_type'>
-      <block wx:if="{{userRole == 1}}">
-        <view style="text-align:center;"><image src='/images/business_icon.png' class='user_business_icon'></image></view>
-      </block>
-    </view> -->
-
-  </view>
-  <!-- 模块按钮 -->
-  <view class='cont_btn_wrap'>
-    <view  bindtap='linkOrder'   class='cont_btn_each  cont_btn_each_left'>
-        <view class='btn_each_cont'>
-            <image src='/images/mine_address_icon.png'  class='mine_each_icon'></image>  
-            <view class='mine_each_name'>我的订单</view>
-        </view>  
-    </view>
-    <view  bindtap='linkGift'  class='cont_btn_each  cont_btn_each_left'>
-        <view class='btn_each_cont'>
-            <image src='/images/mine_help_icon.png'  class='mine_each_icon'></image>  
-            <view class='mine_each_name'>我的礼物</view>
-        </view>  
+<view class="container">
+  <view  class="userinfo f-box">
+    <view>
+      <block  wx:if="{{userInfo.avatarUrl}}">
+            <image class="userinfo-avatar"   src="{{userInfo.avatarUrl}}"></image> 
+        </block>
+        <block wx:else>
+            <image class="userinfo-avatar"   src="/images/def_photo.png"></image> 
+        </block>
     </view>
-    <view  class='cont_btn_each'  bindtap='mineEarnings'>
-        <view class='btn_each_cont'>
-            <image src='/images/mine_jifen_icon.png'  class='mine_each_icon'></image>  
-            <view class='mine_each_name'>我的积分</view>
-        </view>
+    <view class='user-right'>
+      <view class="userinfo-nickname">{{userInfo.nickName}}</view>
+      <view class='user-phone'>点击绑定手机号</view>
     </view>
-    <view class='clearfix'></view>
-    <view  bindtap='linkAddress'  class='cont_btn_each  cont_btn_each_left'>
-        <view class='btn_each_cont'>
-            <image src='/images/mine_coupon_icon.png'  class='mine_each_icon'></image>  
-            <view class='mine_each_name'>我的地址</view>
-        </view>
-    </view>
-    <view  bindtap='linkCollect'  class='cont_btn_each  cont_btn_each_left'>
-        <view class='btn_each_cont'>
-            <image src='/images/mine_collect_icon.png'  class='mine_each_icon'></image>  
-            <view class='mine_each_name'>我的收藏</view>
-        </view>
-    </view>
-    <view  class='cont_btn_each'>
-        <view class='btn_each_cont'>
-            <image src='/images/mine_service_icon.png'  class='mine_each_icon'></image>  
-            <view class='mine_each_name'>我的客服</view>
-        </view>
-        <view class='mine_each_service'>周一至周五</view>
-        <view class='mine_each_service'>9:00-17:00</view>
-        <button  open-type="contact" class="service_btn" plain="true" hover-class="none"></button>
-    </view>
-
-    <view class='clearfix'></view>
-
-    <block wx:if="{{userId=='oovpNwo_ocpujBYeYATSXkDUfJnU'}}">
-        <navigator url='/pages/buyMoonCake/buyMoonCake'  class="only_exit">优惠月饼购买入口</navigator>
-    </block>
-
-
-
-    <block wx:if="{{userId=='oovpNwvQGE0uUqpsQrbiVigaEFM0'}}">
-      <navigator url='/pages/buyMoonCake/buyMoonCake'  class="only_exit">优惠月饼购买入口</navigator>
-      <!-- 假拆分订单临时入口 -->
-      <navigator url='/pages/buyOnly/buyOnly'>特殊用户购买页入口</navigator>
-      <view>----</view>
-      <view>----</view>
-      <view>----</view>
+  </view>
 
-      <navigator url='/pages/indepCoupon/indepCoupon'>28张优惠劵</navigator>
-      <view>----</view>
-      <view>----</view>
-      <view>----</view>
-      <navigator url='/pages/indepCoupon2/indepCoupon2'>30张优惠劵</navigator>
-      <view>----</view>
-      <view>----</view>
-      <view>----</view>
-      <navigator url='/pages/indepCoupon3/indepCoupon3'>30张优惠劵,每人限领一张</navigator>
-    </block>
+  <!-- 采购订单 -->
+ <view class='user-order'>
+    <view class="pad-t20 pad-b20 mar-r20 f-s30 mar-l20 order-title">我的采购订单</view>
+    <view class='f-box order-list f-justify-content-center mar-l20 mar-r20 f-s28'>
+      <view class='f-item  order-item' data-state="0" bindtap='orderInfor'>
+        <text>1</text>
+        <icon class='iconfont icon-icon-test'></icon>
+        <view>待付款</view>
+      </view>
+      <view class='f-item order-item' data-state="2" bindtap='orderInfor'>
+        <text>1</text>
+        <icon class='iconfont icon-daifahuo1'></icon>
+        <view>待发货</view>
+      </view>
+      <view class='f-item order-item' data-state="3" bindtap='orderInfor'>
+        <text>12</text>
+        <icon class='iconfont icon-daishouhuo'></icon>
+        <view>待收货</view>
+      </view>
+    </view>
+</view>
 
-  </view>
-  <!-- <view class="service_tel">客服电话：{{phone}}</view> -->
+  <!-- 我的定制订单 -->
+ <view class='user-order'>
+    <view class="pad-t20 pad-b20 mar-r20 f-s30 mar-l20 order-title">我的定制订单</view>
+    <view class='f-box order-list f-justify-content-center mar-l20 mar-r20 f-s28'>
+      <view class='f-item order-item' data-state="0" bindtap='orderInfor'>
+        <text>1</text>
+        <icon class='iconfont icon-icon-test'></icon>
+        <view>待付款</view>
+      </view>
+      <view class='f-item order-item' data-state="2" bindtap='orderInfor'>
+        <text>1</text>
+        <icon class='iconfont icon-daifahuo1'></icon>
+        <view>待发货</view>
+      </view>
+      <view class='f-item order-item' data-state="3" bindtap='orderInfor'>
+        <text>1</text>
+        <icon class='iconfont icon-daishouhuo'></icon>
+        <view>待收货</view>
+      </view>
+    </view>
+</view>
+  
 
 </view>
 
-<!-- 提示信息 -->
-<view class="modal_wrap  {{hiddenmodal ? 'hidden' : ''}}">
-  <view class="modal  {{hiddenmodal ? 'hidden' : ''}}">{{modalCont}}</view>
-</view>

newsShop/pages/mine/mine.wxss

@@ -1,118 +1,76 @@
 /**index.wxss**/
 .container {
   overflow-x: hidden;
-  background-color: #fff;
   font-family:"Microsoft Yahei",Tahoma,Arial,Helvetica,STHeiti;
 }
 .userinfo {
-  height: 436rpx;
-  background-color:#c4ac74 ; 
-  border-bottom: 1px solid #b4a078;
+  padding:40rpx 30rpx 0;
+  height: 200rpx;
+  background-color:#626262 ; 
 }
 .userinfo-avatar {
   display: block;
-  width: 154rpx;
-  height: 154rpx;
-  /* border:7rpx solid #b19c77; */
-  border:7rpx solid #b7a277; 
+  width: 130rpx;
+  height: 130rpx;
   border-radius: 50%;
-  margin: 60rpx auto 22rpx;
 }
 .userinfo-nickname {
-  font-size: 30rpx;
+  font-size: 36rpx;
+  height:80rpx;
   color: #fff;
-  text-align: center;
 }
-/* 按钮 */
-.header_btn_wrap{
-  float: left;
-  position: relative;
-  left: 50%;
+.user-right{
+  margin-left:26rpx;
 }
-.header_brn_each{
-  float: left;
-  display: block;
-  width: 270rpx;
-  height: 58rpx;
-  font-size: 30rpx;
-  line-height: 58rpx;
-  color: #fff;
+.user-phone{
+  width:220rpx;
   text-align: center;
-  position: relative;
-  right: 50%;
-  border: 1px solid #efeeec;
-  margin: 50rpx 46rpx 0;
+  line-height:60rpx;
+  height:60rpx;
+  background:#c9c9c9;
+  color:#fff;
+  border-radius:60rpx;
 }
-
-.cont_btn_each{
-  display: block;
-  float: left;
-  width: 33.33%;
-  height: 334rpx;
+.order-list{
   text-align: center;
-  border-bottom:1px solid #b4a078; 
-  box-sizing: border-box;
-  position: relative;
 }
-.cont_btn_each_left{
-  border-right:1px solid #b4a078; 
+.user-order{
+  width:750rpx;
+  margin:0 auto 20rpx;
+  background:#fff;
 }
-.btn_each_cont{
-  margin:90rpx auto 0;
+.user-order .iconfont{
+  font-size:48rpx;
 }
-.mine_each_icon{
-  display: block;
-  width: 112rpx;
-  height: 110rpx;
-  margin: 0 auto;
+.order-list{
+  padding:10rpx 0; 
 }
-.mine_each_name{
-  font-size: 30rpx;
-  color: #5a5a5a;
-  text-align: center;
-  padding-top: 34rpx;
+.order-list .f-item{
+  padding:16rpx 0;
+  font-size:26rpx;
+  color:#333;
 }
-/* 客服 */
-button.service_btn{
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  z-index: 1;
-  border: 0px none;
+.order-list .f-item view{
+  margin-top:10rpx;
 }
-.mine_each_service{
-  font-size: 20rpx;
-  color: #969696;
-  text-align: center;
-}
-.service_tel{
-  font-size: 28rpx;
-  line-height: 100rpx;
-  color: #5a5a5a;
-  text-align: center;
+.order-title{
+  border-bottom:2rpx solid #e0e0e0;
 }
-.no_border{
-  border:0px none;
+.order-item{
+  position: relative;
 }
-/* 特殊入口 */
-.only_exit{
-  display: block;
-  width: 400rpx;
-  height: 60rpx;
-  font-size: 30rpx;
-  line-height: 60rpx;
+.order-item text{
+  position: absolute;
+  display: inline-block;
+  width:36rpx;
+  height:36rpx;
+  border-radius:50%;
+  color:#fff;
   text-align: center;
-  color: #fff;
-  background-color: #b4a078;
-  margin: 50rpx auto;
-  border-radius: 4px;
-}
-/* 商务标识 */
-.user_business_icon{
-  display: block;
-  width: 200rpx;
-  height: 38rpx;
-  margin: 20rpx auto 0;
+  line-height:36rpx;
+  font-size:20rpx;
+  background:#e60012;
+  right:50%;
+  margin-right:-42rpx;
+  top:10rpx;
 }

newsShop/style/customized.wxss

@@ -70,7 +70,9 @@ page{
 .f-align-items-stretch{
   align-items: stretch; /*如果项目未设置高度或设为auto，将占满整个容器的高度。*/
 }
-
+.f-flex-wrap{
+  flex-wrap:wrap;
+}
 /* color */
 .c-green{
   color:#00af66

newsShop/style/font/demo_index.html

@@ -85,6 +85,12 @@
               </li>
           
             <li class="dib">
+              <span class="icon iconfont">&#xe651;</span>
+                <div class="name">搜索</div>
+                <div class="code-name">&amp;#xe651;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe61a;</span>
                 <div class="name">我的</div>
                 <div class="code-name">&amp;#xe61a;</div>
@@ -109,11 +115,23 @@
               </li>
           
             <li class="dib">
+              <span class="icon iconfont">&#xe6bb;</span>
+                <div class="name">icon_三角形</div>
+                <div class="code-name">&amp;#xe6bb;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe743;</span>
                 <div class="name">fangda</div>
                 <div class="code-name">&amp;#xe743;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe744;</span>
+                <div class="name">icon_三角形</div>
+                <div class="code-name">&amp;#xe744;</div>
+              </li>
+          
           </ul>
           <div class="article markdown">
           <h2 id="unicode-">Unicode 引用</h2>
@@ -246,6 +264,15 @@
           </li>
           
           <li class="dib">
+            <span class="icon iconfont icon-sousuo"></span>
+            <div class="name">
+              搜索
+            </div>
+            <div class="code-name">.icon-sousuo
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-wode"></span>
             <div class="name">
               我的
@@ -282,6 +309,15 @@
           </li>
           
           <li class="dib">
+            <span class="icon iconfont icon-icon_sanjiaoxing"></span>
+            <div class="name">
+              icon_三角形
+            </div>
+            <div class="code-name">.icon-icon_sanjiaoxing
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-fangda"></span>
             <div class="name">
               fangda
@@ -290,6 +326,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-icon_sanjiaoxing-copy"></span>
+            <div class="name">
+              icon_三角形
+            </div>
+            <div class="code-name">.icon-icon_sanjiaoxing-copy
+            </div>
+          </li>
+          
         </ul>
         <div class="article markdown">
         <h2 id="font-class-">font-class 引用</h2>
@@ -393,6 +438,14 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-sousuo"></use>
+                </svg>
+                <div class="name">搜索</div>
+                <div class="code-name">#icon-sousuo</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-wode"></use>
                 </svg>
                 <div class="name">我的</div>
@@ -425,12 +478,28 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_sanjiaoxing"></use>
+                </svg>
+                <div class="name">icon_三角形</div>
+                <div class="code-name">#icon-icon_sanjiaoxing</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-fangda"></use>
                 </svg>
                 <div class="name">fangda</div>
                 <div class="code-name">#icon-fangda</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_sanjiaoxing-copy"></use>
+                </svg>
+                <div class="name">icon_三角形</div>
+                <div class="code-name">#icon-icon_sanjiaoxing-copy</div>
+            </li>
+          
           </ul>
           <div class="article markdown">
           <h2 id="symbol-">Symbol 引用</h2>

project.config.json

@@ -28,7 +28,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 15,
+			"current": 17,
 			"list": [
 				{
 					"id": 0,
@@ -134,6 +134,20 @@
 					"id": -1,
 					"name": "详情",
 					"pathName": "customized/pages/goodsDetail/goodsDetail",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "shop-分类",
+					"pathName": "newsShop/pages/kind/index",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "改版-我的",
+					"pathName": "newsShop/pages/mine/mine",
 					"scene": null
 				}
 			]

style/customized.wxss

@@ -9,9 +9,10 @@
 /* 通用 */
 page{
   color: #333;
+  font-size:26rpx;
 }
 .auto{
-  margin:0 20rpx;
+  margin:0 26rpx;
 }
 /* flex布局 */
 .f-box{
@@ -70,7 +71,9 @@ page{
 .f-align-items-stretch{
   align-items: stretch; /*如果项目未设置高度或设为auto，将占满整个容器的高度。*/
 }
-
+.f-flex-wrap{
+  flex-wrap:wrap;
+}
 /* color */
 .c-green{
   color:#00af66

utils/util.js

@@ -23,30 +23,30 @@ function changeCup(e) {
     case '1':
       // console.log('正面')
       dataPositionObj = { // 正面数据
-        top: 126,
+        top: 42,
         left: 256,
         width: 334,
-        height: 334
+        height: 450
       };
       propSize = {
-        top: '5cm',
-        right: '5cm',
-        bottom: '5cm',
-        left: '5cm',
+        top: '6cm',
+        right: '9.5cm',
+        bottom: '6cm',
+        left: '9.5cm',
       };
       break;
     case '2':
       dataPositionObj = { // 侧面数据
-        top: 126,
+        top: 42,
         left: 154,
         width: 334,
-        height: 334
+        height: 450
       };
       propSize = {
-        top: '5cm',
-        right: '5cm',
-        bottom: '5cm',
-        left: '5cm',
+        top: '6cm',
+        right: '9.5cm',
+        bottom: '6cm',
+        left: '9.5cm',
       };
       // console.log('背面');
       break;