Merge branch 'pplok' of pplokijuhyg/deguodaigou into master

README.md

@@ -2,11 +2,7 @@
 
 ### 目录结构
 - commponents 组件
-    - index 首页组件
 - page 页面
-    - index 首页
-    - shopping  购物车
-    - orderconfirm  订单确认
 - utils 插件
     - [bin.js](./doc/bin.md)
 - doc 文档存放
@@ -26,7 +22,9 @@
     组件
     - classify/list 右侧商品列表
     - classify/navigation 左侧导航列表
-
+- pages/product/product 商品页
+- pages/personal/personal 我的页面
+- pages/message/message 个人信息
 - pages/orderconfirm/orderconfirm 确认订单 <br>
     组件
     - orderconfirm/agreement 同意协议

app.json

@@ -1,17 +1,20 @@
 {
-    "pages": [
+  "pages": [
-        "pages/orderconfirm/orderconfirm",
+    "pages/orderconfirm/orderconfirm",
-        "pages/classify/classify",
+    "pages/message/message",
-        "pages/shopping/shopping",
+    "pages/personal/personal",
-        "pages/search/search",
+    "pages/product/product",
-        "pages/index/index"
+    "pages/classify/classify",
-    ],
+    "pages/shopping/shopping",
-    "window": {
+    "pages/search/search",
-        "backgroundTextStyle": "light",
+    "pages/index/index"
-        "navigationBarBackgroundColor": "#fff",
+  ],
-        "navigationBarTitleText": "WeChat",
+  "window": {
-        "navigationBarTextStyle": "black"
+    "backgroundTextStyle": "light",
-    },
+    "navigationBarBackgroundColor": "#fff",
-    "style": "v2",
+    "navigationBarTitleText": "WeChat",
-    "sitemapLocation": "sitemap.json"
+    "navigationBarTextStyle": "black"
+  },
+  "style": "v2",
+  "sitemapLocation": "sitemap.json"
 }

pages/message/message.js

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

pages/message/message.json

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

pages/message/message.scss

@@ -0,0 +1,54 @@
+.box {
+  // border-top: 1rpx solid #eaeaea;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  .list {
+    width: 650rpx;
+    .information {
+      margin-top: 43rpx;
+      display: flex;
+      flex-direction: column;
+      font-size: 28rpx;
+      color: #333;
+      border-bottom: 1rpx solid #eaeaea;
+      justify-content: space-between;
+      > input {
+        height: 28rpx;
+        font-size: 28rpx;
+        color: #333;
+      }
+    }
+  }
+  .upload{
+      width: 650rpx;
+      margin-top: 42rpx;
+      .title{
+          font-size: 26rpx;
+          color: #999;
+      }
+      .files{
+          margin-top: 42rpx;
+          width: 195rpx;
+          height: 195rpx;
+          box-shadow:2rpx 3rpx 16rpx 1rpx rgba(51,51,51,0.1);
+          >image{
+              width: 50rpx;
+              height: 41rpx;
+              background-color: #000;
+              margin: 77rpx 73rpx;
+          }
+      }
+  }
+  .submit{
+      margin-top: 295rpx;
+        width: 650rpx;
+        height: 98rpx;
+        background-color: #47C877;
+        border-radius: 49rpx;
+        font-size: 36rpx;
+        line-height: 98rpx;
+        text-align: center;
+        color: #fff;
+  }
+}

pages/message/message.wxml

@@ -0,0 +1,29 @@
+<view class="box">
+    <view class="list">
+        <view class="information">
+            <text>姓名</text>
+            <input type="text" />
+        </view>
+        <view class="information">
+            <text>联系电话</text>
+            <input type="text" />
+        </view>
+        <view class="information">
+            <text>邮箱</text>
+            <input type="text" />
+        </view>
+        <view class="information">
+            <text>护照奥马</text>
+            <input type="text" />
+        </view>
+    </view>
+    <view class="upload">
+        <text class="title">护照正反面照片</text>
+        <view class="files">
+            <image></image>
+        </view>
+    </view>
+    <view class="submit"> 
+        保存
+    </view>
+</view>

pages/message/message.wxss

@@ -0,0 +1 @@
+.box{display:flex;flex-direction:column;align-items:center}.box .list{width:650rpx}.box .list .information{margin-top:43rpx;display:flex;flex-direction:column;font-size:28rpx;color:#333;border-bottom:1rpx solid #eaeaea;justify-content:space-between}.box .list .information>input{height:28rpx;font-size:28rpx;color:#333}.box .upload{width:650rpx;margin-top:42rpx}.box .upload .title{font-size:26rpx;color:#999}.box .upload .files{margin-top:42rpx;width:195rpx;height:195rpx;box-shadow:2rpx 3rpx 16rpx 1rpx rgba(51,51,51,0.1)}.box .upload .files>image{width:50rpx;height:41rpx;background-color:#000;margin:77rpx 73rpx}.box .submit{margin-top:295rpx;width:650rpx;height:98rpx;background-color:#47C877;border-radius:49rpx;font-size:36rpx;line-height:98rpx;text-align:center;color:#fff}

pages/personal/personal.js

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

pages/personal/personal.json

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

pages/personal/personal.scss

@@ -0,0 +1,53 @@
+.box{
+    // border-top: 1rpx solid #eaeaea;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    .card{
+        width: 690rpx;
+        height: 313rpx;
+        background-color: #47C877;
+        display: flex;
+        box-sizing: border-box;
+        padding: 50rpx;
+        font-size: 30rpx;
+        flex-direction: column;
+        color: #fff;
+        margin-top: 20rpx;
+        .user{
+            display: flex;
+            align-items: center;  
+            .head{
+                width: 80rpx;
+                height: 80rpx;
+                margin-right: 32rpx;
+                border-radius: 50%;
+                background-color: #fff;
+            }
+        }
+        .balance{
+            display: flex;
+            flex-direction: column;
+            margin-top: 52rpx;
+        }
+    }
+    .list{
+        display: flex;
+        width: 690rpx;
+        margin-top: 33rpx;
+        flex-direction: column;
+        .option{
+            width: 100%;
+            height: 80rpx;
+            margin-bottom: 15rpx;
+            box-sizing: border-box;
+            padding:  0 30rpx;
+            box-shadow:2rpx 3rpx 16rpx 1rpx rgba(51,51,51,0.1);
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+        }
+    }
+        
+    }
+  

pages/personal/personal.wxml

@@ -0,0 +1,26 @@
+<view class="box">
+    <view class="card">
+        <view class="user">
+            <image class="head"></image>
+            <text>于于于宇于</text>
+        </view>
+        <view class="balance">
+            <text>账户余额</text>
+            <text>480.00</text>
+        </view>
+    </view>
+    <view class="list">
+        <view class="option">
+            <view>我的订单</view>
+            <view>></view>
+        </view>
+        <view class="option">
+            <view>我的订单</view>
+            <view>></view>
+        </view>
+        <view class="option">
+            <view>会员中心</view>
+            <view><text style="font-size:28rpx;color:#999;">非会员 </text>></view>
+        </view>
+    </view>
+</view>

pages/personal/personal.wxss

@@ -0,0 +1 @@
+.box{display:flex;flex-direction:column;align-items:center}.box .card{width:690rpx;height:313rpx;background-color:#47C877;display:flex;box-sizing:border-box;padding:50rpx;font-size:30rpx;flex-direction:column;color:#fff;margin-top:20rpx}.box .card .user{display:flex;align-items:center}.box .card .user .head{width:80rpx;height:80rpx;margin-right:32rpx;border-radius:50%;background-color:#fff}.box .card .balance{display:flex;flex-direction:column;margin-top:52rpx}.box .list{display:flex;width:690rpx;margin-top:33rpx;flex-direction:column}.box .list .option{width:100%;height:80rpx;margin-bottom:15rpx;box-sizing:border-box;padding:0 30rpx;box-shadow:2rpx 3rpx 16rpx 1rpx rgba(51,51,51,0.1);display:flex;align-items:center;justify-content:space-between}

pages/product/product.js

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

pages/product/product.json

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

pages/product/product.scss

@@ -0,0 +1,36 @@
+.box{
+    border-top: 1rpx solid #eaeaea;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    .swiper{
+        margin-top: 109rpx;
+        width: 389rpx;
+        height: 657rpx;
+        .image{
+            width: 389rpx;
+            height: 549rpx;
+            background-color: #000;
+        }
+    }
+    .title{
+        font-size: 32rpx;
+        color: #333;
+        margin-bottom: 34rpx;
+    }
+    .menery{
+        font-size: 34rpx;
+        color: #666;
+        margin-bottom: 70rpx;
+    }
+    .add{
+        width: 308rpx;
+        height: 98rpx;
+        background-color: #50CA80;
+        border-radius: 49rpx;
+        line-height: 98rpx;
+        font-size: 34rpx;
+        color: #fff;
+        text-align: center;
+    }
+}

pages/product/product.wxml

@@ -0,0 +1,24 @@
+<view class="box">
+    <swiper indicator-dots="{{true}}" circular="{{true}}" autoplay="{{true}}" interval="{{2000}}" class="swiper">
+        <block>
+            <swiper-item>
+                <image class="image"> </image>
+            </swiper-item>
+        </block>
+        <block>
+            <swiper-item>
+                <image class="image"> </image>
+            </swiper-item>
+        </block>
+        <block>
+            <swiper-item>
+                <image class="image"> </image>
+            </swiper-item>
+        </block>
+    </swiper>
+    <text class="title">产品名称产品名称产品名称</text>
+    <text class="menery">$140,000</text>
+     <picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}">
+    <view class="add">加入购物车</view>
+    </picker>
+</view>

pages/product/product.wxss

@@ -0,0 +1 @@
+.box{border-top:1rpx solid #eaeaea;display:flex;flex-direction:column;align-items:center}.box .swiper{margin-top:109rpx;width:389rpx;height:657rpx}.box .swiper .image{width:389rpx;height:549rpx;background-color:#000}.box .title{font-size:32rpx;color:#333;margin-bottom:34rpx}.box .menery{font-size:34rpx;color:#666;margin-bottom:70rpx}.box .add{width:308rpx;height:98rpx;background-color:#50CA80;border-radius:49rpx;line-height:98rpx;font-size:34rpx;color:#fff;text-align:center}