Browse Source

样式修改

wangyong 6 years ago
parent
commit
6ab87d7971

BIN
app - 副本.zip


+ 0 - 1
app.json

@@ -28,7 +28,6 @@
     "pages/editAddress/editAddress",
     "pages/editAddress/editAddress",
     "pages/selectAddress/selectAddress",
     "pages/selectAddress/selectAddress",
     "pages/mineHelp/index",
     "pages/mineHelp/index",
-    "pages/search/search",
     "pages/orders/orders_index",
     "pages/orders/orders_index",
     "pages/confirmOrder/confirmOrder",
     "pages/confirmOrder/confirmOrder",
     "pages/kindList/kindList",
     "pages/kindList/kindList",

BIN
images/canvas_order.png


+ 3 - 3
pages/orderCanvas/orderCanavs.wxml

@@ -29,10 +29,10 @@
   <view class='footer-box'>
   <view class='footer-box'>
     <view class='f-box'>
     <view class='f-box'>
       <view class='f-item f-box f-justify-content-center c-white bg-orange' style='width:100%'>
       <view class='f-item f-box f-justify-content-center c-white bg-orange' style='width:100%'>
-        <button class='share-box f-item' open-type="share">分享</button>
+        <button class='share-box f-item f-s32' open-type="share">分享</button>
       </view>
       </view>
-      <view class='f-item f-box f-justify-content-center c-white' style='width:100%;background:#eea957' bindtap='uploadImg'>上传付款凭证</view>
-      <view class='f-item f-box f-justify-content-center c-white bg-theme' style='width:100%' bindtap='orderList'>查看订单</view>
+      <view class='f-item f-box f-justify-content-center c-white f-s32' style='width:100%;background:#eea957' bindtap='uploadImg'>上传付款凭证</view>
+      <view class='f-item f-box f-justify-content-center c-white bg-theme f-s32' style='width:100%' bindtap='orderList'>查看订单</view>
     </view>
     </view>
   </view>
   </view>
 </view>
 </view>

+ 1 - 0
pages/orderCanvas/orderCanavs.wxss

@@ -5,6 +5,7 @@
 .share-box{
 .share-box{
   background:none;
   background:none;
   color:#fff;
   color:#fff;
+  line-height:100rpx;
 }
 }
 /* 商品信息 */
 /* 商品信息 */
 .goods_infor{
 .goods_infor{

+ 0 - 169
pages/search/search.js

@@ -1,169 +0,0 @@
-// search.js
-var touchDot = 0;//触摸时的原点  
-var time = 0;// 时间记录,用于滑动时且时间小于1s则执行左右滑动  
-var interval = "";// 记录/清理时间记录
-Page({
-  data: {
-    wordClick : false,
-    searchValue : '',
-    searchList:[],
-    logoList:[
-      { 
-        logoUrl: '/pages/brandInfor/brandInfor?title=Moleskine&intro=传奇笔记本&src=https://www.daliangzao.net/images/1513653278658_Moleskine-2.jpg&src1=https://www.daliangzao.net/images/1513653278658_Moleskine-2.jpg&id=2991', 
-        logoSrc: 'https://www.daliangzao.net/images/searchLogo/search_logo_1.png'
-      },
-      { 
-        logoUrl: '/pages/brandInfor/brandInfor?title=凌美&intro=唤醒书写的记忆&src=https://www.daliangzao.net/images/1513653080002_Lamy-2.jpg&src1=https://www.daliangzao.net/images/1513653080002_Lamy-2.jpg&id=3023', 
-        logoSrc: 'https://www.daliangzao.net/images/searchLogo/search_logo_2.png' 
-      },
-      { 
-        logoUrl: '/pages/brandInfor/brandInfor?title=哲品&intro=东方生活品牌&src=https://www.daliangzao.net/images/1513653110782_哲品-2.jpg&src1=https://www.daliangzao.net/images/1513653110782_哲品-2.jpg&id=3030', 
-        logoSrc: 'https://www.daliangzao.net/images/searchLogo/search_logo_3.png' 
-      },
-      { 
-        logoUrl: '/pages/brandInfor/brandInfor?title=Foreo&intro=美容护肤新革命&src=https://www.daliangzao.net/images/1513652834541_Foreo-2.jpg&src1=https://www.daliangzao.net/images/1513652834541_Foreo-2.jpg&id=3011', 
-        logoSrc: 'https://www.daliangzao.net/images/searchLogo/search_logo_4.png' 
-      },
-      { 
-        logoUrl: '/pages/brandInfor/brandInfor?title=Best-Life百灵&intro=遇见更好的自己&src=https://www.daliangzao.net/images/1513652716420_Best-Life百灵-2.jpg&src1=https://www.daliangzao.net/images/1513652716420_Best-Life百灵-2.jpg&id=3008', 
-        logoSrc: 'https://www.daliangzao.net/images/searchLogo/search_logo_5.png' 
-      },
-      { 
-        logoUrl: '/pages/brandInfor/brandInfor?title=Cutipol&intro=来自葡萄牙的纯手工厨具&src=https://www.daliangzao.net/images/1513652786108_Cutipol-2.jpg&src1=https://www.daliangzao.net/images/1513652786108_Cutipol-2.jpg&id=3010', 
-        logoSrc: 'https://www.daliangzao.net/images/searchLogo/search_logo_6.png' 
-      },
-      { 
-        logoUrl: '/pages/brandInfor/brandInfor?title=BOSE&intro=享音乐之极&src=https://www.daliangzao.net/images/1513652743364_Bose-2.jpg&src1=https://www.daliangzao.net/images/1513652743364_Bose-2.jpg&id=3003', 
-        logoSrc: 'https://www.daliangzao.net/images/searchLogo/search_logo_7.png' 
-      },
-      { 
-        logoUrl: '/pages/brandInfor/brandInfor?title=B&O&intro=B&O&src=https://www.daliangzao.net/images/1513645951531_B&O-2.jpg&src1=https://www.daliangzao.net/images/1513645951531_B&O-2.jpg&id=3004', 
-        logoSrc: 'https://www.daliangzao.net/images/searchLogo/search_logo_8.png' 
-      },
-      { 
-        logoUrl: '/pages/brandInfor/brandInfor?title=PUEBCO&intro=工业风家品&src=https://www.daliangzao.net/images/1513653187662_PUEBCO-2.jpg&src1=https://www.daliangzao.net/images/1513653187662_PUEBCO-2.jpg&id=3019', 
-        logoSrc: 'https://www.daliangzao.net/images/searchLogo/search_logo_9.png' 
-      },
-      { 
-        logoUrl: '/pages/brandInfor/brandInfor?title=CORKCICLE&intro=来自美国佛罗里达&src=https://www.daliangzao.net/images/1513652765187_CORKCICLE-2.jpg&src1=https://www.daliangzao.net/images/1513652765187_CORKCICLE-2.jpg&id=3009', 
-        logoSrc: 'https://www.daliangzao.net/images/searchLogo/search_logo_10.png' 
-      },
-      { 
-        logoUrl: '/pages/brandInfor/brandInfor?title=JORDAN&JUDY&intro=以创新设计为基点的时尚生活品牌&src=https://www.daliangzao.net/images/1513652927301_JORDAN&JUDY佐敦朱迪-2.jpg&src1=https://www.daliangzao.net/images/1513652927301_JORDAN&JUDY佐敦朱迪-2.jpg&id=3015', 
-        logoSrc: 'https://www.daliangzao.net/images/searchLogo/search_logo_11.png' 
-      },
-      { 
-        logoUrl: '/pages/brandInfor/brandInfor?title=ALLYO+&intro=专注生产研发&src=https://www.daliangzao.net/images/1513645926762_ALLOY-2.jpg&src1=https://www.daliangzao.net/images/1513645926762_ALLOY-2.jpg&id=3006', 
-        logoSrc: 'https://www.daliangzao.net/images/searchLogo/search_logo_12.png' 
-      }
-    ]
-  },
-  onLoad: function () {
-    var that = this;
-    var host = getApp().globalData.servsers;
-
-    wx.request({
-      url: host +"keywordapi/keywordallxcx",
-      data: {},
-      method: 'GET', // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT
-      header: {
-        'Accept': 'application/json'
-      },
-      success: function (res) {
-        that.setData({
-          searchList: res.data.rows,
-        });
-        if (res == null || res.data == null) {
-          console.error('网络请求失败');
-          return;
-        }
-      }
-    })
-  },
-  inputSearch:function(e){
-    this.setData({
-      searchValue: e.detail.value
-    }) 
-  },
-
-  cancelVal:function(e){
-    this.setData({
-      searchValue: '',
-    })
-    wx.navigateBack();   //返回上一个页面
-  },
-
-  searResult:function(e){
-    let data;
-    let localStorageValue = [];
-    if (this.data.searchValue != '') {
-
-      //调用API从本地缓存中获取数据  
-      var searchData = wx.getStorageSync('searchData') || []
-      searchData.push(this.data.inputValue)
-      wx.setStorageSync('searchData', searchData)
-      wx.redirectTo({
-        url: '/pages/searchList/searchList?commodity_name=' + this.data.searchValue
-      })
-    } else {
-      console.log('6666');
-      wx.redirectTo({
-        url: '/pages/searchList/searchList'
-      })
-    }  
-
-
-
-  },
-
-  writeVal:function(e){//点击热搜词后
-    var that = this; 
-    var thisVal = e.currentTarget.dataset.val;
-    that.setData({
-      wordClick : true,
-      'searchValue': thisVal
-    })
-    wx.navigateTo({
-      url: '/pages/searchList/searchList?commodity_name=' + thisVal,
-      success:function(){
-        that.setData({
-          wordClick: false
-        })
-      }
-    })
-  },
-
-  // 触摸开始事件  
-  touchStart: function (e) {
-    touchDot = e.touches[0].pageX; // 获取触摸时的原点  
-   
-    interval = setInterval(function () {
-      time++;
-    }, 100);
-  },  
-  // 触摸移动事件  
-  touchMove: function (e) {
-    var touchMove = e.touches[0].pageX;
-    console.log("touchMove:" + touchMove + " touchDot:" + touchDot + " diff:" + (touchMove - touchDot));
-    // 向左滑动    
-    if (touchMove - touchDot <= -40 && time < 10) {
-      wx.switchTab({
-        url: '/pages/index/index'
-      });
-    }
-    // 向右滑动  
-    if (touchMove - touchDot >= 40 && time < 10) {
-      console.log('向右滑动');
-      wx.switchTab({
-        url: '/pages/index/index'
-      });
-    }
-  },
-  // 触摸结束事件  
-  touchEnd: function (e) {
-    clearInterval(interval); // 清除setInterval  
-    time = 0;
-  }
-})
-var that;
-var Util = require('../../utils/util.js'); 

+ 0 - 1
pages/search/search.json

@@ -1 +0,0 @@
-{}

+ 0 - 44
pages/search/search.wxml

@@ -1,44 +0,0 @@
-<!--search.wxml-->
-<view class="container"  bindtouchstart="touchStart" bindtouchmove="touchMove" bindtouchend="touchEnd">
-  <form bindsubmit="searchSubmit" action="">
-    <!-- 头部搜索 -->
-    <view class="header-search">
-      <view class="header_search_wrap">
-        <view class="header_search">
-          <icon type="search"  size="12" color="#929aa0"  class="header_search_icon"></icon>
-          <input type="text" class="header_search_placeholder" value="{{searchValue}}"  bindinput="inputSearch"  bindconfirm="searResult"  focus="true"  confirm-type="search"  placeholder="输入搜索关键字"  placeholder-style="padding-left:5rpx;color: #929aa0;font-family:'Microsoft Yahei';" />    
-        </view>    
-      </view>
-      <view class="cancel_btn"  bindtap="cancelVal">取消</view>   
-    </view>
-
-    <!-- 热门搜索 -->
-    <view class="search_msg">
-      <view class="search_msg_title">热门搜索</view>
-    </view>
-
-    <view class="clearfix"></view>
-
-    <!-- 热门词 -->
-    <view class="search_content">
-      <block wx:for="{{searchList}}"  wx:key="index"  wx:foe-index="i">
-        <view class="each_word"  data-val="{{item.keyword_name}}"   bindtap="writeVal">{{item.keyword_name}}</view>
-      </block>
-    </view>
-  </form>
-
-</view>
-
-<view class='search_logo_wrap'>
-  <view class='logo_title_space'></view>
-  <view class='logo_list  clearfix'>
-    <view class='list_title'>品牌定制</view>
-    <block wx:for="{{logoList}}" wx:key="index" wx:for-index="i">
-      <navigator url='{{item.logoUrl}}' class='logo_nav'>
-        <image wx:if='{{item.logoSrc}}' src='{{item.logoSrc}}' class='logo_img'></image>
-      </navigator>
-    </block>
-  </view>
-</view>
-
-

+ 0 - 143
pages/search/search.wxss

@@ -1,143 +0,0 @@
-/* search.wxss */
-page{
-  background-color: #fff;
-}
-.header-search{
-  display: flex;
-  flex-direction: row;
-  height:104rpx;
-  background-color:#1a1d1f;
-  align-items: center;
-}
-.header_logo{
-  width:126rpx;
-  height:39rpx;
-  margin-left:30rpx;
-}
-.header_search_wrap{
-  padding:0 0 0 36rpx;
-}
-.header_search{
-  width:530rpx;
-  height:64rpx;
-  border-radius:30rpx;
-  color:#fff;
-  background-color:#282c2f;
-  display: flex;
-  align-items: center;
-  justify-content: flex-start;
-  padding-left:20rpx;
-}
-.header_search input{
-  width: 480rpx;
-  color:#fff;
-}
-.header_search_icon{
-  display: block;
-  width:28rpx;
-  height:28rpx;
-  margin-right:12rpx;
-}
-.header_search_placeholder{
-  color:#969696;
-  font-size: 22rpx;
-}
-
-.header_nav_wrap{
-  width:100%;
-  height:78rpx;
-  color:#fff;
-  background-color:#131617;
-  /* overflow:hidden; */
-}
-.header_nav{
-  white-space: nowrap; 
-  display: flex;
-}
-.header_nav_each{
-  height:42rpx;
-  font-size: 28rpx;
-  line-height:42rpx;
-  padding: 0 20rpx;
-  display: inline-block;
-  margin:18rpx 20rpx;
-  border:1px solid #131617;
-}
-.header_nav_active{
-  border:1px solid #fff;
-  border-radius: 20rpx;
-}
-.cancel_btn{
-  flex: 1;
-  font-size: 24rpx;
-  text-align: center;
-  color: #fff;
-}
-.search_btn{
-  
-}
-.search_msg{
-  padding:44rpx 0 0 40rpx;
-}
-.search_msg_img,.search_msg_title{
-  display:block;
-  float: left;
-}
-.search_msg_img{
-  width: 22rpx;
-  height: 28rpx;
-  margin-right: 14rpx;
-}
-.search_msg_img image{
-  display: block;
-  width: 22rpx;
-  height: 28rpx;
-  margin-top: 3rpx;
-}
-.search_msg_title{
-  font-size: 24rpx;
-  color:#242424;
-}
-.search_content{
-  padding:30rpx 0 0  40rpx;
-}
-.each_word{
-  display: inline-block;
-  font-size: 24rpx;
-  color:#e60012;
-  background-color: #f9f9f9;
-  padding:9rpx 20rpx;
-  border:1rpx solid #e60012;
-  border-radius: 20px;
-  margin:0 30rpx 30rpx 0; 
-}
-.each_word_active{
-  color:#fff;
-  background-color: #e60012;
-}
-/* logo */
-.logo_title_space{
-  width: 100%;
-  height: 18rpx;
-  background-color: #eee;
-}
-.logo_list{
-  padding: 20rpx 0;
-  background-color: #fff;
-}
-.logo_nav{
-  display: block;
-  float: left;
-  width: 25%;
-}
-.logo_img{
-  display: block;
-  width: 150rpx;
-  height: 150rpx;
-  margin:20rpx auto;
-}
-.list_title{
-  padding: 44rpx 0 10rpx 32rpx;
-  font-size: 24rpx;
-  color: #242424;
-}