miniprogram / winebook · 提交

转到一个项目

作者 lihongjuan
提交 405efc2943a2847a03b03fecb0d95cf0a582b0e6 2 个父辈 f4ba853e eef4760f

Merge branch 'master' of http://114.215.101.231:8099/miniprogram/jiuzidian 

# Conflicts:
#	app.wxss
#	pages/findblock/niangjiushi/niangjiushi.wxml
#	pages/findblock/zhuanjiapinjiu/zhuanjiapinjiu.wxml
#	pages/findblock/zhuanjiapinjiu/zhuanjiapinjiu.wxss
#	project.config.json
内嵌 并排对比
正在显示 67 个修改的文件 包含 2045 行增加 和 186 行删除
@@ -59,7 +59,11 @@ App({ @@ -59,7 +59,11 @@ App({
59 } else if (res.data.code == '201') { 59 } else if (res.data.code == '201') {
60 resolve(res.data); 60 resolve(res.data);
61 } else { 61 } else {
62 - console.log(res) 62 + wx.showToast({
  63 + title: res.data.msg,
  64 + duration: 1200,
  65 + icon:'none'
  66 + })
63 reject(res) 67 reject(res)
64 } 68 }
65 69
@@ -151,6 +155,7 @@ App({ @@ -151,6 +155,7 @@ App({
151 }, 155 },
152 globalData: { 156 globalData: {
153 userInfo: null, 157 userInfo: null,
154 - url:'http://winesbook.cn/static/images_mini/' 158 + url:'http://winesbook.cn/static/images_mini/',
  159 + baseUrl:'https://winesbook.cn/api'
155 } 160 }
156 }) 161 })
@@ -40,6 +40,14 @@ @@ -40,6 +40,14 @@
40 "pages/findblock/zhuanjiapinjiudetail/zhuanjiapinjiudetail", 40 "pages/findblock/zhuanjiapinjiudetail/zhuanjiapinjiudetail",
41 "pages/findblock/niangjiushi/niangjiushi", 41 "pages/findblock/niangjiushi/niangjiushi",
42 "pages/findblock/jiudandetail/jiudandetail", 42 "pages/findblock/jiudandetail/jiudandetail",
  43 + "pages/myblock/history/history",
  44 + "pages/myblock/jiupin/jiupin",
  45 + "pages/myblock/pinpai/pinpai",
  46 + "pages/myblock/company/company",
  47 + "pages/myblock/message/message",
  48 + "pages/myblock/feedback/feedback",
  49 + "pages/myblock/rule/rule",
  50 + "pages/myblock/about/about",
43 "pages/findblock/meirixinjiu/meirixinjiu", 51 "pages/findblock/meirixinjiu/meirixinjiu",
44 "pages/findblock/jiulist/jiulist", 52 "pages/findblock/jiulist/jiulist",
45 "pages/findblock/putongwenzhang/putongwenzhang", 53 "pages/findblock/putongwenzhang/putongwenzhang",
1 -  
2 -  
3 -  
4 -@font-face {font-family: "iconfont"; 1 +@font-face {
  2 + font-family: "iconfont";
5 src: url('//at.alicdn.com/t/font_1185667_ds07xvngh3k.eot?t=1557490149623'); /* IE9 */ 3 src: url('//at.alicdn.com/t/font_1185667_ds07xvngh3k.eot?t=1557490149623'); /* IE9 */
6 - src: url('//at.alicdn.com/t/font_1185667_ds07xvngh3k.eot?t=1557490149623#iefix') format('embedded-opentype'), /* IE6-IE8 */  
7 - url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAJ4AAsAAAAABiAAAAItAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCCcAooRwE2AiQDCAsGAAQgBYRtBzEbbgXInpo8CQBIEAKw5OZZAMTD9/v9b+1zz1NNXxTzaBJFExlPJNEqFptWpnvEM0P7d//nMgdo757P88fyFNGAfSG/5fSl6QDVnJ5SE3ITbm/9Qwq8v752fZ5r6iXQgeQHmmsHRSUlBdDeeEAD7MLRkW0gQ98wdsELfE6gaU5P6ejxkxtoyux1gbhx1bOgWYjKMivUhWrD0Sxeqainx+kDXkbfj792RZ2kUrBbTl1auzD7wSkpHpWPXAwIMQI6XUGBLUAmzjVmT6gIxlU0s1VL4FiNwQ9lGXjEUZ2C/XV2fRvMwFzwg7dWgASPRRluT1KAqN49Re6l1+3sX7v38OPlfx0EKN+ntcoB8qvg1rf+6+39V29l8PFPvkfh8n02zA/q6/mC91cPHMiG1nanrKkbx5Pqftuamijh4NDvVNvkZMVQN5ngr5nNUKhbITO7BRUte1BVdwBNm21Pt4yIisgNbPIJEPq+kHS9RqHvm8zsDyqm/lDVjwJNF2J0Zcu6uNo8cpMsJRftJwwcTo3r1XbceEVeEVuS10b8HUkeJHC8bUe5sKWUZIkd+b03UTVohBPcgNcojhkz4ZAcHfiq2XS4/VKTQgOHE2g7QhCLIi5ke4ICDpYywWTVrnz+CvEUYhbp6Kur3iEiF8yOxgZGA8itKR3U9yjv5O55JpQykCFYAm3AIhKLMZQ1LwoRhxrwJ6QzU0NnlBlqGmxvSf7uFDTZ9hTO3ELt2lUrVS4AAAA=') format('woff2'),  
8 - url('//at.alicdn.com/t/font_1185667_ds07xvngh3k.woff?t=1557490149623') format('woff'),  
9 - url('//at.alicdn.com/t/font_1185667_ds07xvngh3k.ttf?t=1557490149623') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */  
10 - url('//at.alicdn.com/t/font_1185667_ds07xvngh3k.svg?t=1557490149623#iconfont') format('svg'); /* iOS 4.1- */ 4 + src: url('//at.alicdn.com/t/font_1185667_ds07xvngh3k.eot?t=1557490149623#iefix') format('embedded-opentype'),
  5 + /* IE6-IE8 */ url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAJ4AAsAAAAABiAAAAItAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCCcAooRwE2AiQDCAsGAAQgBYRtBzEbbgXInpo8CQBIEAKw5OZZAMTD9/v9b+1zz1NNXxTzaBJFExlPJNEqFptWpnvEM0P7d//nMgdo757P88fyFNGAfSG/5fSl6QDVnJ5SE3ITbm/9Qwq8v752fZ5r6iXQgeQHmmsHRSUlBdDeeEAD7MLRkW0gQ98wdsELfE6gaU5P6ejxkxtoyux1gbhx1bOgWYjKMivUhWrD0Sxeqainx+kDXkbfj792RZ2kUrBbTl1auzD7wSkpHpWPXAwIMQI6XUGBLUAmzjVmT6gIxlU0s1VL4FiNwQ9lGXjEUZ2C/XV2fRvMwFzwg7dWgASPRRluT1KAqN49Re6l1+3sX7v38OPlfx0EKN+ntcoB8qvg1rf+6+39V29l8PFPvkfh8n02zA/q6/mC91cPHMiG1nanrKkbx5Pqftuamijh4NDvVNvkZMVQN5ngr5nNUKhbITO7BRUte1BVdwBNm21Pt4yIisgNbPIJEPq+kHS9RqHvm8zsDyqm/lDVjwJNF2J0Zcu6uNo8cpMsJRftJwwcTo3r1XbceEVeEVuS10b8HUkeJHC8bUe5sKWUZIkd+b03UTVohBPcgNcojhkz4ZAcHfiq2XS4/VKTQgOHE2g7QhCLIi5ke4ICDpYywWTVrnz+CvEUYhbp6Kur3iEiF8yOxgZGA8itKR3U9yjv5O55JpQykCFYAm3AIhKLMZQ1LwoRhxrwJ6QzU0NnlBlqGmxvSf7uFDTZ9hTO3ELt2lUrVS4AAAA=') format('woff2'),
  6 + url('//at.alicdn.com/t/font_1185667_ds07xvngh3k.woff?t=1557490149623') format('woff'),
  7 + url('//at.alicdn.com/t/font_1185667_ds07xvngh3k.ttf?t=1557490149623') format('truetype'),
  8 + /* chrome,
  9 + firefox,
  10 + opera,
  11 + Safari,
  12 + Android,
  13 + iOS 4.2+ */ url('//at.alicdn.com/t/font_1185667_ds07xvngh3k.svg?t=1557490149623#iconfont') format('svg'); /* iOS 4.1- */
11 } 14 }
12 15
13 -  
14 .iconfont { 16 .iconfont {
15 font-family: "iconfont" !important; 17 font-family: "iconfont" !important;
16 font-size: 16px; 18 font-size: 16px;
@@ -23,57 +25,56 @@ @@ -23,57 +25,56 @@
23 content: "\e63f"; 25 content: "\e63f";
24 } 26 }
25 27
26 -image{  
27 - width:100%;  
28 - height:100%; 28 +image {
  29 + width: 100%;
  30 + height: 100%;
29 } 31 }
30 -/* 遮罩层 */  
31 32
32 -.register{  
33 - width: 100%;  
34 - height: 100%;  
35 - background-color: rgba(0,0,0,0.5);  
36 - position:fixed;  
37 - top:180rpx;  
38 -  
39 - left:0;  
40 - right:0;  
41 - z-index: 5;  
42 - } 33 +.register {
  34 + width: 100%;
  35 + height: 100%;
  36 + background-color: rgba(0, 0, 0, 0.5);
  37 + position: fixed;
  38 + top: 180rpx;
  39 + left: 0;
  40 + right: 0;
  41 + z-index: 5;
  42 +}
43 43
44 - /* 箭头样式 */ 44 +/* 箭头样式 */
45 45
46 - .listrow{  
47 - color:#999999; 46 +.listrow {
  47 + color: #999;
48 font-size: 24rpx; 48 font-size: 24rpx;
49 } 49 }
50 50
51 /* 星星图片 */ 51 /* 星星图片 */
52 - .starimg{  
53 - width:34rpx;  
54 - height:32rpx;  
55 - font-size: 0  
56 - }  
57 52
58 - .redrow{  
59 - width:12rpx;  
60 - height:25rpx;  
61 - font-size: 0 53 +.starimg {
  54 + width: 34rpx;
  55 + height: 32rpx;
  56 + font-size: 0;
  57 +}
  58 +
  59 +.redrow {
  60 + width: 12rpx;
  61 + height: 25rpx;
  62 + font-size: 0;
62 } 63 }
63 64
64 /* 关注 */ 65 /* 关注 */
65 66
66 -.atten{ 67 +.atten {
67 /* width:100rpx; */ 68 /* width:100rpx; */
68 padding: 0 20rpx; 69 padding: 0 20rpx;
69 - height:50rpx;  
70 - background:rgba(232,24,37,1);  
71 - border-radius:2rpx; 70 + height: 50rpx;
  71 + background: rgba(232, 24, 37, 1);
  72 + border-radius: 2rpx;
72 font-size: 26rpx; 73 font-size: 26rpx;
73 - color:#fff; 74 + color: #fff;
74 text-align: center; 75 text-align: center;
75 line-height: 50rpx; 76 line-height: 50rpx;
76 - } 77 +}
77 78
78 /* 上三角 */ 79 /* 上三角 */
79 .boxright{ 80 .boxright{
@@ -96,4 +97,16 @@ image{ @@ -96,4 +97,16 @@ image{
96 font-size: 30rpx; 97 font-size: 30rpx;
97 text-align: center; 98 text-align: center;
98 margin-top:30rpx; 99 margin-top:30rpx;
99 - }  
  100 + }
  101 +
  102 +
  103 +.showall {
  104 + color: #999;
  105 + font-size: 26rpx;
  106 + margin-top: 60rpx;
  107 + text-align: center;
  108 +}
  109 +
  110 +.nambottom .namebottomitem:first-child {
  111 + padding-left: 0;
  112 +}
  1 +// pages/homeblock/niangjiuteacher/niangjiuteacher.js
  2 +var WxParse = require('../../../wxParse/wxParse.js');
  3 +const app = getApp()
  4 +Page({
  5 +
  6 + /**
  7 + * 页面的初始数据
  8 + */
  9 + data: {
  10 + url: '',
  11 + id: '',
  12 + page: 1
  13 + },
  14 +
  15 + /**
  16 + * 生命周期函数--监听页面加载
  17 + */
  18 + onLoad: function (options) {
  19 + this.setData({
  20 + url: app.globalData.url,
  21 + id: options.id
  22 + })
  23 + let token=wx.getStorageSync("token");
  24 + if(token==''){
  25 + wx.navigateTo({
  26 + url: '/pages/login/login?id=' + this.data.id + '&type=' + 1,//type=1发现的首页专家品酒
  27 + })
  28 +
  29 + wx.setStorageSync("url", "/pages/findblock/wenzhangdetail/wenzhangdetail")
  30 + }
  31 +
  32 + },
  33 + //获取酿酒师
  34 + getniangjiu() {
  35 + let that = this;
  36 + let url = 'index/Find/article_detail', params = {
  37 + id: that.data.id,
  38 +
  39 +
  40 + }
  41 + app.post(url, params).then((res) => {
  42 + console.log(res);
  43 + that.setData({
  44 + info: res.info,
  45 +
  46 + })
  47 +
  48 +
  49 +
  50 + WxParse.wxParse('article', 'html', res.info.content, that, 5)
  51 +
  52 +
  53 + }).catch((err) => {
  54 +
  55 + })
  56 + },
  57 + showinfo(e) {
  58 + let idx = e.currentTarget.dataset.idx;
  59 + console.log(idx)
  60 + let newattr = this.data.attr;
  61 + for (var i = 0; i < newattr.length; i++) {
  62 + if (i == idx) {
  63 + newattr[i].show = !newattr[i].show
  64 + }
  65 + }
  66 + this.setData({
  67 + attr: newattr
  68 + })
  69 + },
  70 +
  71 +
  72 + //点赞
  73 + zan(e) {
  74 + let that = this;
  75 + let id = e.currentTarget.dataset.id;
  76 +
  77 + let url = 'index/Common/good', params = {
  78 + sort: 4,
  79 + id: id
  80 +
  81 + }
  82 + app.post(url, params).then((res) => {
  83 + console.log(res);
  84 + wx.showToast({
  85 + title: res,
  86 + icon: "none"
  87 + })
  88 +
  89 + let newinfo = that.data.info;
  90 + console.log(newinfo)
  91 + if (newinfo.is_good == 0) {
  92 + newinfo.is_good = 1;
  93 + newinfo.good_count = newinfo.good_count + 1
  94 + } else {
  95 + newinfo.is_good = 0;
  96 + if (newinfo.good_count == 0) {
  97 + newinfo.good_count = 0
  98 + } else {
  99 + newinfo.good_count = newinfo.good_count - 1
  100 + }
  101 + }
  102 +
  103 +
  104 + that.setData({
  105 + info: newinfo
  106 + })
  107 +
  108 + console.log(that.data.info)
  109 +
  110 +
  111 + }).catch((err) => {
  112 +
  113 + })
  114 + },
  115 + //评论
  116 + ping(e) {
  117 + let id = e.currentTarget.dataset.id;
  118 + wx.navigateTo({
  119 + url: '/pages/myblock/pingjia/pingjia?id=' + id + '&type=' + 4,
  120 + })
  121 + },
  122 + /**
  123 + * 生命周期函数--监听页面初次渲染完成
  124 + */
  125 + onReady: function () {
  126 +
  127 + },
  128 +
  129 + /**
  130 + * 生命周期函数--监听页面显示
  131 + */
  132 + onShow: function () {
  133 + this.getniangjiu()
  134 + },
  135 +
  136 + /**
  137 + * 生命周期函数--监听页面隐藏
  138 + */
  139 + onHide: function () {
  140 +
  141 + },
  142 +
  143 + /**
  144 + * 生命周期函数--监听页面卸载
  145 + */
  146 + onUnload: function () {
  147 +
  148 + },
  149 +
  150 + /**
  151 + * 页面相关事件处理函数--监听用户下拉动作
  152 + */
  153 + onPullDownRefresh: function () {
  154 +
  155 + },
  156 +
  157 + /**
  158 + * 页面上拉触底事件的处理函数
  159 + */
  160 + onReachBottom: function () {
  161 +
  162 + },
  163 +
  164 + /**
  165 + * 用户点击右上角分享
  166 + */
  167 + onShareAppMessage: function () {
  168 + let that = this;
  169 +
  170 + let url = url = '/pages/findblock/wenzhangdetail/wenzhangdetail?id=' + that.data.id
  171 + return {
  172 + title: '发现', // 转发后 所显示的title
  173 + // path: '/pages/home/buildtextdetail/buildtextdetail?buildid='+buildid+'&gettoken='+newtoken, // 相对的路径
  174 +
  175 + path: url,//建档攻略分享1
  176 + // path:'',
  177 + success: (res) => { // 成功后要做的事情
  178 + console.log(res)
  179 +
  180 + },
  181 + fail: function (res) {
  182 + // 分享失败
  183 + console.log(res)
  184 + }
  185 + }
  186 +
  187 + }
  188 +})
  1 +{
  2 + "usingComponents": {}
  3 +}
  1 +<import src="../../../wxParse/wxParse.wxml" />
  2 +<view class="teacherhead">
  3 + <view class="teacherleft">
  4 + <view class="teacimg">
  5 + <image src="{{info.avatar}}"></image>
  6 + </view>
  7 +
  8 + <view class="teacname">{{info.name}}</view>
  9 + <view class="teacgouimg">
  10 + <image src="{{url}}aicon_20x.png"></image>
  11 + </view>
  12 + </view>
  13 +
  14 +
  15 +</view>
  16 +
  17 +<view class="jiubottom">
  18 + <view class="jiuleft">
  19 + <view class="jiuleftimg" catchtap="zan" data-id="{{info.id}}">
  20 + <image src="{{url}}/aicon_47x.png" wx:if="{{info.is_good==0}}"></image>
  21 + <image src="{{url}}/aicon_46x.png" wx:else></image>
  22 + </view>
  23 + <view class="jiuzan">{{info.good_count}}</view>
  24 + </view>
  25 +
  26 + <view class="jiumiddle" catchtap="ping" data-id="{{info.id}}">
  27 + <view class="middleimg">
  28 + <image src="{{url}}/aicon_67x.png"></image>
  29 + </view>
  30 + <view class="tiao">{{info.comment_count}}</view>
  31 + </view>
  32 +
  33 + <view class="lastimg">
  34 +
  35 + <view class="jiuright">
  36 + <image src="{{url}}/aicon_68x.png"></image>
  37 + <button class="lj_share" catchtap="buildshare" open-type='share'></button>
  38 + </view>
  39 + <view class="tiao">分享</view>
  40 +
  41 + </view>
  42 +
  43 +
  44 +</view>
  45 +
  46 +<view class="wineimg">
  47 + <image src="{{info.thumb}}"></image>
  48 +</view>
  49 +
  50 +
  51 +<view class="niangjiubox">
  52 +
  53 +
  54 +
  55 +
  56 + <view class="brandtext">
  57 +
  58 + <template is="wxParse" data="{{wxParseData:article.nodes}}" />
  59 +
  60 +
  61 +
  62 + </view>
  63 +
  64 +
  65 +
  66 +
  67 +</view>
  1 +@import '../../homeblock/brandpage/brandpage.wxss';
  2 +
  3 +image{
  4 + width:100%;
  5 + height:100%;
  6 +}
  7 +
  8 +.teacherhead{
  9 + display:flex;
  10 + justify-content: space-between;
  11 + align-items: center;
  12 + padding: 17rpx 32rpx;
  13 + box-sizing: border-box;
  14 + border-top:1rpx solid #f5f5f5;
  15 +}
  16 +.teacherleft{
  17 + display:flex;
  18 + align-items: center;
  19 +
  20 +}
  21 +.teacimg{
  22 + width:60rpx;
  23 + height:60rpx;
  24 + border-radius:50%;
  25 +}
  26 +.teacimg image{
  27 + border-radius: 50%;
  28 +}
  29 +.teacname{
  30 + color:#1A1A1A;
  31 + margin-left:30rpx;
  32 + font-size:28rpx;
  33 + font-family:PingFang-SC-Medium;
  34 + font-weight:500;
  35 +
  36 +}
  37 +.teacgouimg{
  38 + width:24rpx;
  39 + height:24rpx;
  40 + font-size: 0;
  41 + margin-left:20rpx;
  42 +}
  43 +.wineimg{
  44 + width:750rpx;
  45 + height:328rpx;
  46 + margin-top:20rpx;
  47 +}
  48 +.boxtopleft{
  49 + font-weight: bold
  50 +}
  51 +.baisinfo{
  52 + padding: 38rpx 0;
  53 + box-sizing: border-box;
  54 + border-bottom: 1rpx solid #f5f5f5;
  55 + display:flex;
  56 + align-items: center;
  57 +
  58 +}
  59 +.baisinfo:last-child{
  60 + border-bottom: none;
  61 +}
  62 +.basinfoleft{
  63 + display:block;
  64 + width:114rpx;
  65 + color:#999999;
  66 + font-size: 26rpx;
  67 +}
  68 +.baisinforight{
  69 + margin-left:95rpx;
  70 +}
  71 +.brandboxitem:first-child{
  72 + padding-bottom: 0
  73 +}
  74 +.brandlsit{
  75 + color:#666666;
  76 + font-size: 26rpx;
  77 +
  78 +}
  79 +.jiubottom{
  80 + display:flex;
  81 + align-items: center;
  82 + justify-content: space-between;
  83 + padding: 0rpx 78rpx;
  84 + box-sizing: border-box
  85 +
  86 +}
  87 +.jiuleft{
  88 + display:flex;
  89 + align-items: center;
  90 +}
  91 +.jiumiddle{
  92 + display:flex;
  93 + align-items: center
  94 +}
  95 +.jiuleftimg{
  96 + width:30rpx;
  97 + height:28rpx;
  98 + font-size: 0
  99 +}
  100 +image{
  101 + width:100%;
  102 + height:100%;
  103 +}
  104 +.jiuzan{
  105 + color:#666666;
  106 + font-size: 28rpx;
  107 + margin-left:16rpx;
  108 +}
  109 +.middleimg{
  110 + width:29rpx;
  111 + height:27rpx;
  112 + font-size: 0
  113 +}
  114 +.tiao{
  115 + color:#666666;
  116 + font-size: 28rpx;
  117 + margin-left:16rpx;
  118 +}
  119 +.jiuright{
  120 + width:26rpx;
  121 + height:26rpx;
  122 + font-size: 0;
  123 + position: relative;
  124 +}
  125 +.lastimg{
  126 + display:flex;
  127 + align-items: center
  128 +}
  129 +
  130 +.lj_share{
  131 + width:20rpx;
  132 + height:30rpx;
  133 + border:none;
  134 + position: absolute;
  135 + right:0;
  136 + top:0;
  137 + background: transparent
  138 +
  139 +}
  140 +button::after{
  141 + border:none;
  142 + outline:none;
  143 +}
1 <view class="wineblock" wx:for="{{list}}" wx:key='' bindtap="detail" data-id="{{item.id}}"> 1 <view class="wineblock" wx:for="{{list}}" wx:key='' bindtap="detail" data-id="{{item.id}}">
2 -  
3 <view class="winetitle">{{item.title}}</view> 2 <view class="winetitle">{{item.title}}</view>
4 -  
5 <view class="wineimg" catchtap="entervideo" data-url="{{item.video}}"> 3 <view class="wineimg" catchtap="entervideo" data-url="{{item.video}}">
6 <image src="{{item.video_image}}"></image> 4 <image src="{{item.video_image}}"></image>
7 -  
8 <view class="vimg"> 5 <view class="vimg">
9 <image src="{{url}}/aicon_70x.png"></image> 6 <image src="{{url}}/aicon_70x.png"></image>
10 </view> 7 </view>
  8 + <view class="winebottonright">
  9 + <view class="winerighttou">
  10 + <view class="winerighttouimg">
  11 + <image src="{{url}}aicon_66x.png"></image>
  12 + </view>
  13 + <view class="winezan">18</view>
  14 + </view>
  15 + <view class="winerighttou">
  16 + <view class="winerighttouimg">
  17 + <image src="{{url}}aicon_67x.png"></image>
  18 + </view>
  19 + <view class="winezan">54</view>
  20 + </view>
  21 + <view class="winerighttou">
  22 + <view class="winerighttouimg">
  23 + <image src="{{url}}aicon_68x.png"></image>
  24 + </view>
  25 + </view>
  26 + </view>
  27 + </view>
  28 +</view>
  29 +<view class="wineblock">
  30 +
  31 + <view class="winetitle">浓香酒酿酒大师：沈才宏</view>
  32 +
  33 + <view class="wineimg">
  34 + <image src="{{url}}aicon_64.png"></image>
11 </view> 35 </view>
12 36
13 <view class="winebottom"> 37 <view class="winebottom">
@@ -10,24 +10,10 @@ @@ -10,24 +10,10 @@
10 margin:30rpx auto 0; 10 margin:30rpx auto 0;
11 position: relative; 11 position: relative;
12 } 12 }
13 -.vimg{  
14 - width:100rpx;  
15 - height:100rpx;  
16 - font-size: 0;  
17 - position: absolute;  
18 - top:50%;  
19 - left:50%;  
20 - transform: translate(-50%,-50%)  
21 -}  
22 -.vimg image{  
23 - width:100%;  
24 - height:100%  
25 -}  
26 .winebottom{ 13 .winebottom{
27 display:flex; 14 display:flex;
28 justify-content: space-between; 15 justify-content: space-between;
29 align-items: center; 16 align-items: center;
30 - padding: 0 32rpx;  
31 box-sizing: border-box; 17 box-sizing: border-box;
32 margin-top:30rpx; 18 margin-top:30rpx;
33 } 19 }
@@ -35,8 +21,8 @@ @@ -35,8 +21,8 @@
35 width:60rpx; 21 width:60rpx;
36 height:60rpx; 22 height:60rpx;
37 font-size: 0; 23 font-size: 0;
38 - border-radius:50%;  
39 - 24 + border-radius: 50%;
  25 + overflow: hidden;
40 } 26 }
41 .winebottomleftimg image{ 27 .winebottomleftimg image{
42 width:100%; 28 width:100%;
@@ -51,7 +37,7 @@ @@ -51,7 +37,7 @@
51 width:345rpx; 37 width:345rpx;
52 display:flex; 38 display:flex;
53 align-items: center; 39 align-items: center;
54 - justify-content: space-around 40 + justify-content: space-between
55 } 41 }
56 .winerighttouimg{ 42 .winerighttouimg{
57 width:30rpx; 43 width:30rpx;
@@ -76,7 +62,8 @@ @@ -76,7 +62,8 @@
76 .wineblock{ 62 .wineblock{
77 border-bottom: 1rpx solid #f5f5f5; 63 border-bottom: 1rpx solid #f5f5f5;
78 padding-bottom: 30rpx; 64 padding-bottom: 30rpx;
79 - margin-top:33rpx; 65 + margin: 33rpx auto 0;
  66 +
80 } 67 }
81 .pin{ 68 .pin{
82 width:16rpx; 69 width:16rpx;
@@ -96,4 +83,28 @@ @@ -96,4 +83,28 @@
96 button::after{ 83 button::after{
97 border:none; 84 border:none;
98 outline:none; 85 outline:none;
  86 +}
  87 +
  88 +
  89 +.video_play{
  90 + position: absolute;
  91 + top: 50%;
  92 + left: 50%;
  93 + width: 80rpx;
  94 + height: 80rpx;
  95 + transform: translate(-50%,-50%);
  96 + -webkit-transform: translate(-50%,-50%);
  97 +}
  98 +.vimg{
  99 + width:100rpx;
  100 + height:100rpx;
  101 + font-size: 0;
  102 + position: absolute;
  103 + top:50%;
  104 + left:50%;
  105 + transform: translate(-50%,-50%)
  106 +}
  107 +.vimg image{
  108 + width:100%;
  109 + height:100%
99 } 110 }
  1 +// pages/forgetmima.js
  2 +Page({
  3 +
  4 + /**
  5 + * 页面的初始数据
  6 + */
  7 + data: {
  8 +
  9 + },
  10 +
  11 + /**
  12 + * 生命周期函数--监听页面加载
  13 + */
  14 + onLoad: function (options) {
  15 +
  16 + },
  17 +
  18 + //获取验证码
  19 + getcode() {
  20 + let that = this;
  21 + let currentTime = that.data.currentTime;
  22 + that.setData({
  23 + disable: true
  24 + })
  25 + interval = setInterval(function () {
  26 + currentTime--;
  27 + that.setData({
  28 + time: currentTime + 's后再次发送',
  29 +
  30 + })
  31 + if (currentTime <= 0) {
  32 + clearInterval(interval)
  33 + that.setData({
  34 + time: '重新发送',
  35 + currentTime: 61,
  36 + disable: false
  37 + })
  38 + }
  39 + }, 1000)
  40 +
  41 +
  42 + var url = '/user/Profile/getCode';
  43 + var params = {
  44 + mobile: that.data.phonenum,
  45 +
  46 + }
  47 +
  48 + app.post(url, params).then((res) => {
  49 + console.log(res);
  50 + if (res.code) {
  51 +
  52 + }
  53 +
  54 + }).catch((err) => {
  55 + console.log(err)
  56 + wx.showToast({
  57 + title: err.ResultMsg,
  58 + icon: "none"
  59 + })
  60 + })
  61 + },
  62 +
  63 + /**
  64 + * 生命周期函数--监听页面初次渲染完成
  65 + */
  66 + onReady: function () {
  67 +
  68 + },
  69 +
  70 + /**
  71 + * 生命周期函数--监听页面显示
  72 + */
  73 + onShow: function () {
  74 +
  75 + },
  76 +
  77 + /**
  78 + * 生命周期函数--监听页面隐藏
  79 + */
  80 + onHide: function () {
  81 +
  82 + },
  83 +
  84 + /**
  85 + * 生命周期函数--监听页面卸载
  86 + */
  87 + onUnload: function () {
  88 +
  89 + },
  90 +
  91 + /**
  92 + * 页面相关事件处理函数--监听用户下拉动作
  93 + */
  94 + onPullDownRefresh: function () {
  95 +
  96 + },
  97 +
  98 + /**
  99 + * 页面上拉触底事件的处理函数
  100 + */
  101 + onReachBottom: function () {
  102 +
  103 + },
  104 +
  105 + /**
  106 + * 用户点击右上角分享
  107 + */
  108 + onShareAppMessage: function () {
  109 +
  110 + }
  111 +})
  1 +{
  2 + "usingComponents": {}
  3 +}
  1 +<!--pages/forgetmima.wxml-->
  2 +<text>pages/forgetmima.wxml</text>
  1 +/* pages/forgetmima.wxss */
  1 +// pages/homeblock/bofangexample/bofangexample.js
  2 +Page({
  3 +
  4 + /**
  5 + * 页面的初始数据
  6 + */
  7 + data: {
  8 + url:''
  9 + },
  10 +
  11 + /**
  12 + * 生命周期函数--监听页面加载
  13 + */
  14 + onLoad: function (options) {
  15 + console.log(options)
  16 + let url=wx.getStorageSync("quanurl")
  17 + this.setData({
  18 + url: url
  19 + })
  20 + },
  21 +
  22 + /**
  23 + * 生命周期函数--监听页面初次渲染完成
  24 + */
  25 + onReady: function () {
  26 +
  27 + },
  28 +
  29 + /**
  30 + * 生命周期函数--监听页面显示
  31 + */
  32 + onShow: function () {
  33 +
  34 + },
  35 +
  36 + /**
  37 + * 生命周期函数--监听页面隐藏
  38 + */
  39 + onHide: function () {
  40 +
  41 + },
  42 +
  43 + /**
  44 + * 生命周期函数--监听页面卸载
  45 + */
  46 + onUnload: function () {
  47 +
  48 + },
  49 +
  50 + /**
  51 + * 页面相关事件处理函数--监听用户下拉动作
  52 + */
  53 + onPullDownRefresh: function () {
  54 +
  55 + },
  56 +
  57 + /**
  58 + * 页面上拉触底事件的处理函数
  59 + */
  60 + onReachBottom: function () {
  61 +
  62 + },
  63 +
  64 + /**
  65 + * 用户点击右上角分享
  66 + */
  67 + onShareAppMessage: function () {
  68 +
  69 + }
  70 +})
  1 +{
  2 + "navigationBarTitleText": ""
  3 +}
  1 +<view class="page-section page-section-gap">
  2 + <web-view src="{{url}}"></web-view>
  3 +</view>
  1 +/* pages/homeblock/bofangexample/bofangexample.wxss */
@@ -126,6 +126,7 @@ image{ @@ -126,6 +126,7 @@ image{
126 padding: 37rpx 31rpx; 126 padding: 37rpx 31rpx;
127 box-sizing: border-box; 127 box-sizing: border-box;
128 border-bottom: 1rpx solid #f5f5f5; 128 border-bottom: 1rpx solid #f5f5f5;
  129 + background: #FFF;
129 } 130 }
130 .searchitemleft{ 131 .searchitemleft{
131 display:flex; 132 display:flex;
1 { 1 {
2 "navigationStyle": "custom", 2 "navigationStyle": "custom",
3 - "usingComponents": {} 3 + "usingComponents": {},
  4 + "navigationBarTitleText": "关于我们"
4 } 5 }
1 <view class="headimg"> 1 <view class="headimg">
2 <image src="{{url}}aicon_87x.png"></image> 2 <image src="{{url}}aicon_87x.png"></image>
3 - <navigator class="peopleinfo" url=''> 3 + <navigator class="peopleinfo" url='/pages/myblock/personpage/personpage'>
4 <view class="peoplecontent"> 4 <view class="peoplecontent">
5 <view class="peopleleft"> 5 <view class="peopleleft">
6 <image src="{{userInfo.avatar||url+'aicon_77@2x.png'}}"></image> 6 <image src="{{userInfo.avatar||url+'aicon_77@2x.png'}}"></image>
@@ -44,23 +44,23 @@ @@ -44,23 +44,23 @@
44 <view class="collect"> 44 <view class="collect">
45 <view class="mycollect">我的收藏</view> 45 <view class="mycollect">我的收藏</view>
46 <view class="collectnum"> 46 <view class="collectnum">
47 - <view class="collectitem">  
48 - <view class="collectitemnum">19</view> 47 + <navigator url='/pages/myblock/jiupin/jiupin' class="collectitem">
  48 + <view class="collectitemnum">{{userInfo.wine_count}}</view>
49 <view class="collectitemtitle">酒品</view> 49 <view class="collectitemtitle">酒品</view>
50 - </view>  
51 - <view class="collectitem">  
52 - <view class="collectitemnum">19</view> 50 + </navigator>
  51 + <navigator url='/pages/myblock/pinpai/pinpai' class="collectitem">
  52 + <view class="collectitemnum">{{userInfo.brand_count}}</view>
53 <view class="collectitemtitle">品牌</view> 53 <view class="collectitemtitle">品牌</view>
54 - </view>  
55 - <view class="collectitem">  
56 - <view class="collectitemnum">19</view> 54 + </navigator>
  55 + <navigator url='/pages/myblock/jiupin/jiupin' class="collectitem">
  56 + <view class="collectitemnum">{{userInfo.wine_rec_count}}</view>
57 <view class="collectitemtitle">酒企</view> 57 <view class="collectitemtitle">酒企</view>
58 - </view> 58 + </navigator>
59 </view> 59 </view>
60 </view> 60 </view>
61 61
62 <view class="mylist"> 62 <view class="mylist">
63 - <navigator class="mylistitem" url="/pages/myblock/personpage/personpage" hover-class="none"> 63 + <navigator class="mylistitem" url="/pages/myblock/message/message" hover-class="none">
64 <view class="mylistleft"> 64 <view class="mylistleft">
65 <view class="mylistimage"> 65 <view class="mylistimage">
66 <image src="{{url}}aicon_82x.png"></image> 66 <image src="{{url}}aicon_82x.png"></image>
@@ -83,11 +83,11 @@ @@ -83,11 +83,11 @@
83 <view class="mylistimage"> 83 <view class="mylistimage">
84 <image src="{{url}}aicon_84x.png"></image> 84 <image src="{{url}}aicon_84x.png"></image>
85 </view> 85 </view>
86 - <view class="message">账号与安全</view> 86 + <view class="message">账号与安全</view>
87 </view> 87 </view>
88 <view class="iconfont icon-jiantou listrow"></view> 88 <view class="iconfont icon-jiantou listrow"></view>
89 </navigator> 89 </navigator>
90 - <navigator class="mylistitem"> 90 + <navigator class="mylistitem" url='/pages/myblock/rule/rule'>
91 <view class="mylistleft"> 91 <view class="mylistleft">
92 <view class="mylistimage"> 92 <view class="mylistimage">
93 <image src="{{url}}aicon_85x.png"></image> 93 <image src="{{url}}aicon_85x.png"></image>
@@ -96,7 +96,7 @@ @@ -96,7 +96,7 @@
96 </view> 96 </view>
97 <view class="iconfont icon-jiantou listrow"></view> 97 <view class="iconfont icon-jiantou listrow"></view>
98 </navigator> 98 </navigator>
99 - <navigator class="mylistitem"> 99 + <navigator class="mylistitem" url='/pages/myblock/about/about'>
100 <view class="mylistleft"> 100 <view class="mylistleft">
101 <view class="mylistimage"> 101 <view class="mylistimage">
102 <image src="{{url}}aicon_86x.png"></image> 102 <image src="{{url}}aicon_86x.png"></image>
  1 +// pages/myblock/rule/rule.js
  2 +let WxParse = require('../../../wxParse/wxParse.js');
  3 +const app = getApp();
  4 +Page({
  5 +
  6 + /**
  7 + * 页面的初始数据
  8 + */
  9 + data: {
  10 +
  11 + },
  12 +
  13 + /**
  14 + * 生命周期函数--监听页面加载
  15 + */
  16 + onLoad: function (options) {
  17 + this.getRule();
  18 + },
  19 + getRule() {
  20 + let url = '/index/Common/about';
  21 + app.post(url, {}).then(r => {
  22 + WxParse.wxParse('contentHtml', 'html', r.content, this, 5)
  23 + })
  24 + },
  25 +
  26 + /**
  27 + * 生命周期函数--监听页面初次渲染完成
  28 + */
  29 + onReady: function () {
  30 +
  31 + },
  32 +
  33 + /**
  34 + * 生命周期函数--监听页面显示
  35 + */
  36 + onShow: function () {
  37 +
  38 + },
  39 +
  40 + /**
  41 + * 生命周期函数--监听页面隐藏
  42 + */
  43 + onHide: function () {
  44 +
  45 + },
  46 +
  47 + /**
  48 + * 生命周期函数--监听页面卸载
  49 + */
  50 + onUnload: function () {
  51 +
  52 + },
  53 +
  54 + /**
  55 + * 页面相关事件处理函数--监听用户下拉动作
  56 + */
  57 + onPullDownRefresh: function () {
  58 +
  59 + },
  60 +
  61 + /**
  62 + * 页面上拉触底事件的处理函数
  63 + */
  64 + onReachBottom: function () {
  65 +
  66 + },
  67 +
  68 + /**
  69 + * 用户点击右上角分享
  70 + */
  71 + onShareAppMessage: function () {
  72 +
  73 + }
  74 +})
  1 +{
  2 + "usingComponents": {},
  3 + "navigationBarTitleText": "关于我们"
  4 +}
  1 +<!--pages/myblock/rule/rule.wxml-->
  2 +<view class='content'>
  3 + <import src="/wxParse/wxParse.wxml" />
  4 + <template is="wxParse" data="{{wxParseData:contentHtml.nodes}}" />
  5 + </view>
  1 +
  2 +.content{
  3 + font-size: 30rpx;
  4 + padding: 30rpx;
  5 + color: #666;
  6 +}
  1 +// pages/myblock/company/company.js
  2 +Page({
  3 +
  4 + /**
  5 + * 页面的初始数据
  6 + */
  7 + data: {
  8 +
  9 + },
  10 +
  11 + /**
  12 + * 生命周期函数--监听页面加载
  13 + */
  14 + onLoad: function (options) {
  15 +
  16 + },
  17 +
  18 + /**
  19 + * 生命周期函数--监听页面初次渲染完成
  20 + */
  21 + onReady: function () {
  22 +
  23 + },
  24 +
  25 + /**
  26 + * 生命周期函数--监听页面显示
  27 + */
  28 + onShow: function () {
  29 +
  30 + },
  31 +
  32 + /**
  33 + * 生命周期函数--监听页面隐藏
  34 + */
  35 + onHide: function () {
  36 +
  37 + },
  38 +
  39 + /**
  40 + * 生命周期函数--监听页面卸载
  41 + */
  42 + onUnload: function () {
  43 +
  44 + },
  45 +
  46 + /**
  47 + * 页面相关事件处理函数--监听用户下拉动作
  48 + */
  49 + onPullDownRefresh: function () {
  50 +
  51 + },
  52 +
  53 + /**
  54 + * 页面上拉触底事件的处理函数
  55 + */
  56 + onReachBottom: function () {
  57 +
  58 + },
  59 +
  60 + /**
  61 + * 用户点击右上角分享
  62 + */
  63 + onShareAppMessage: function () {
  64 +
  65 + }
  66 +})
  1 +{
  2 + "usingComponents": {}
  3 +}
  1 +<!--pages/myblock/company/company.wxml-->
  2 +<text>pages/myblock/company/company.wxml</text>
  1 +/* pages/myblock/company/company.wxss */
  1 +// pages/myblock/feedback/feedback.js
  2 +const app = getApp();
  3 +Page({
  4 +
  5 + /**
  6 + * 页面的初始数据
  7 + */
  8 + data: {
  9 +
  10 + },
  11 +
  12 + /**
  13 + * 生命周期函数--监听页面加载
  14 + */
  15 + onLoad: function (options) {
  16 +
  17 + },
  18 + inputFeedback(e){
  19 + this.setData({
  20 + content:e.detail.value
  21 + })
  22 + },
  23 + subFeedBack(){
  24 + let url = 'user/Center/feedback',params = {
  25 + content:this.data.content
  26 + };
  27 + params.content?app.post(url,params).then(r=>{
  28 + wx.showToast({
  29 + title: '提交成功',
  30 + icon:'none'
  31 + })
  32 + setTimeout(r=>{
  33 + wx.navigateBack({})
  34 + },1200)
  35 + }):wx.showToast({
  36 + title: '请输入您要反馈的内容',
  37 + icon:'none'
  38 + })
  39 + },
  40 + /**
  41 + * 生命周期函数--监听页面初次渲染完成
  42 + */
  43 + onReady: function () {
  44 +
  45 + },
  46 +
  47 + /**
  48 + * 生命周期函数--监听页面显示
  49 + */
  50 + onShow: function () {
  51 +
  52 + },
  53 +
  54 + /**
  55 + * 生命周期函数--监听页面隐藏
  56 + */
  57 + onHide: function () {
  58 +
  59 + },
  60 +
  61 + /**
  62 + * 生命周期函数--监听页面卸载
  63 + */
  64 + onUnload: function () {
  65 +
  66 + },
  67 +
  68 + /**
  69 + * 页面相关事件处理函数--监听用户下拉动作
  70 + */
  71 + onPullDownRefresh: function () {
  72 +
  73 + },
  74 +
  75 + /**
  76 + * 页面上拉触底事件的处理函数
  77 + */
  78 + onReachBottom: function () {
  79 +
  80 + },
  81 +
  82 + /**
  83 + * 用户点击右上角分享
  84 + */
  85 + onShareAppMessage: function () {
  86 +
  87 + }
  88 +})
  1 +{
  2 + "usingComponents": {},
  3 + "navigationBarTitleText": "用户反馈"
  4 +}
  1 +<!--pages/myblock/feedback/feedback.wxml-->
  2 +<view>
  3 + <textarea class='feedback_box' bindinput='inputFeedback' placeholder='请输入您的意见，我们会积极处理并改正的~'></textarea>
  4 +
  5 + <view class='submit_btn' bindtap='subFeedBack'>提交</view>
  6 +</view>
  1 +/* pages/myblock/feedback/feedback.wxss */
  2 +.feedback_box{
  3 + margin: 40rpx 32rpx 0 32rpx;
  4 + background-color: #F2F2F2;
  5 + border-radius: 10rpx;
  6 + padding: 25rpx;
  7 + font-size: 28rpx;
  8 + display: block;
  9 + width: auto;
  10 +}
  11 +.submit_btn{
  12 + height: 80rpx;
  13 + width: 660rpx;
  14 + color: #FFF;
  15 + font-size: 28rpx;
  16 + background-color: #E81825;
  17 + display: flex;
  18 + align-items: center;
  19 + justify-content: center;
  20 + border-radius: 40rpx;
  21 + margin: 40rpx auto;
  22 +}
@@ -114,7 +114,7 @@ @@ -114,7 +114,7 @@
114 <view class='wine_list' wx:if='{{selectindex==3}}' bindtap='closeShareAction'> 114 <view class='wine_list' wx:if='{{selectindex==3}}' bindtap='closeShareAction'>
115 <view class='list_item' wx:for='{{list}}' wx:key=''> 115 <view class='list_item' wx:for='{{list}}' wx:key=''>
116 <view class='img_box'> 116 <view class='img_box'>
117 - <image src='{{item.thumb}}' mode='widthFix'></image> 117 + <image src='{{item.avatar}}' mode='widthFix'></image>
118 </view> 118 </view>
119 <view class='wine_title'>{{item.title}}</view> 119 <view class='wine_title'>{{item.title}}</view>
120 <view class='wine_name'>{{item.user_nickname}}</view> 120 <view class='wine_name'>{{item.user_nickname}}</view>
@@ -136,42 +136,82 @@ @@ -136,42 +136,82 @@
136 <image src='/img/gengduo.png' mode='widthFix' class='moreIcon'></image> 136 <image src='/img/gengduo.png' mode='widthFix' class='moreIcon'></image>
137 <view class='min_action_box'> 137 <view class='min_action_box'>
138 <view class='action_btn {{item.is_favorite?"active":""}}'>{{!item.is_favorite?"收藏":"已收藏"}}</view> 138 <view class='action_btn {{item.is_favorite?"active":""}}'>{{!item.is_favorite?"收藏":"已收藏"}}</view>
139 - <view class='action_btn'>分享 <button open-type='share'></button></view> 139 + <view class='action_btn'>分享
  140 + <button open-type='share'></button>
  141 + </view>
140 </view> 142 </view>
141 </view> 143 </view>
142 </view> 144 </view>
143 </view> 145 </view>
144 - <!-- <view class='list_item'>  
145 - <view class='img_box'>  
146 - <image src='/img/aicon_65.png'></image> 146 + </view>
  147 + <!-- 专家品酒 -->
  148 + <view class='wine_list' wx:if='{{selectindex==4}}'>
  149 + <view class="wineblock" wx:for='{{list}}' wx:key=''>
  150 + <view class="winetitle">{{item.title}}</view>
  151 + <view class="wineimg">
  152 + <image src="{{item.video_image}}"></image>
  153 + <image src='/img/aicon_70.png' class='video_play'></image>
147 </view> 154 </view>
148 - <view class='wine_title'>万丈红尘一人醉</view>  
149 - <view class='wine_name'>唐国强</view>  
150 - <view class='wine_leavel'>lv12</view>  
151 - <view class='action_box'>  
152 - <view class='single_action'>  
153 - <view class='zan_icon'>  
154 - <image src='/img/aicon_47.png' mode='widthFix'></image> 155 + <view class="winebottom">
  156 + <view class="winebottomleft">
  157 + <view class="winebottomleftimg">
  158 + <image src="{{item.avatar}}"></image>
155 </view> 159 </view>
156 - 618 160 + <view class="wineeng">{{item.name}}</view>
157 </view> 161 </view>
158 - <view class='single_action'>  
159 - <view class='zan_icon'> 162 + <view class="winebottonright">
  163 + <view class="winerighttou">
  164 + <view class="winerighttouimg">
  165 + <image src='{{!item.is_good?"/img/aicon_47.png":"/img/aicon_46.png"}}' mode='widthFix'></image>
  166 + </view>
  167 + <view class="winezan">{{item.good_count}}</view>
  168 + </view>
  169 + <view class="winerighttou">
  170 + <view class="winerighttouimg">
  171 + <image src='/img/aicon_67.png' mode='widthFix'></image>
  172 + </view>
  173 + <view class="winezan">{{item.comment_count}}</view>
  174 + </view>
  175 + <view class="winerighttou">
  176 + <view class="winerighttouimg">
  177 + <image src="/img/aicon_74.png"></image>
  178 + </view>
  179 + </view>
  180 + </view>
  181 + </view>
  182 + </view>
  183 + </view>
  184 + <view class="niangjiulist" wx:if='{{selectindex==5}}'>
  185 + <view class="niangjiuitem" wx:for='{{list}}' wx:key=''>
  186 + <view class="teachimg">
  187 + <image src="{{item.avatar}}"></image>
  188 + </view>
  189 + <view class="jiuname">{{item.name}}</view>
  190 + <view class="atten">{{item.is_concern==0?'关注':'已关注'}}</view>
  191 + <view class="jiubottom">
  192 + <view class="jiuleft">
  193 + <view class="jiuleftimg">
  194 + <image src='{{!item.is_good?"/img/aicon_47.png":"/img/aicon_46.png"}}' mode='widthFix'></image>
  195 + </view>
  196 + <view class="jiuzan">{{item.good_count}}</view>
  197 + </view>
  198 +
  199 + <view class="jiumiddle">
  200 + <view class="middleimg">
160 <image src='/img/aicon_67.png' mode='widthFix'></image> 201 <image src='/img/aicon_67.png' mode='widthFix'></image>
161 </view> 202 </view>
162 - 54 203 + <view class="tiao">{{item.comment_count}}</view>
163 </view> 204 </view>
164 - <view class='single_action'>  
165 - <image src='/img/gengduo.png' mode='widthFix' class='more'></image>  
166 - 205 + <view class="jiuright">
  206 + <image src="/img/aicon_68.png"></image>
167 </view> 207 </view>
168 </view> 208 </view>
169 - </view> --> 209 + </view>
170 </view> 210 </view>
171 <view class='showall' wx:if='{{noMore&&noData}}'>已显示全部内容</view> 211 <view class='showall' wx:if='{{noMore&&noData}}'>已显示全部内容</view>
172 </view> 212 </view>
173 </view> 213 </view>
174 - 214 +<view class='showall' wx:if='{{noMore&&noData}}'>已显示全部内容</view>
175 <view class='noData' wx:if='{{!noData}}'> 215 <view class='noData' wx:if='{{!noData}}'>
176 暂无相关数据 216 暂无相关数据
177 </view> 217 </view>
1 @import '../../homeblock/zhinengselect/zhinengselect.wxss'; 1 @import '../../homeblock/zhinengselect/zhinengselect.wxss';
2 @import '../../jiudan/jiudan.wxss'; 2 @import '../../jiudan/jiudan.wxss';
  3 +@import '../../findblock/zhuanjiapinjiu/zhuanjiapinjiu.wxss';
  4 +@import '../../findblock/niangjiushi/niangjiushi.wxss';
3 5
4 page{ 6 page{
5 width: 100%; 7 width: 100%;
@@ -236,10 +238,7 @@ page{ @@ -236,10 +238,7 @@ page{
236 background: #E81825; 238 background: #E81825;
237 color: #FFF; 239 color: #FFF;
238 } 240 }
239 -.img_box{  
240 - overflow: auto;  
241 - border-radius: 0;  
242 -} 241 +
243 .shareAction .more{ 242 .shareAction .more{
244 margin-right: 0!important; 243 margin-right: 0!important;
245 } 244 }
1 // pages/myblock/huanbangshouji/huanbangshouji.js 1 // pages/myblock/huanbangshouji/huanbangshouji.js
  2 +const app = getApp();
2 Page({ 3 Page({
3 4
4 /** 5 /**
5 * 页面的初始数据 6 * 页面的初始数据
6 */ 7 */
7 data: { 8 data: {
  9 + params:{
8 10
  11 + },
  12 + getting: true,
  13 + code: 60
9 }, 14 },
10 15
11 /** 16 /**
@@ -14,6 +19,66 @@ Page({ @@ -14,6 +19,66 @@ Page({
14 onLoad: function (options) { 19 onLoad: function (options) {
15 20
16 }, 21 },
  22 + getCode(){
  23 + let phone = this.data.params.mobile, url ='/user/Profile/getNewCode',that = this;
  24 + if (!(/^1[3456789]\d{9}$/.test(phone))){
  25 + wx.showToast({
  26 + title: '请输入正确的手机号',
  27 + icon:'none'
  28 + })
  29 + }else{
  30 + let params = {
  31 + mobile: this.data.params.mobile
  32 + },code=60;
  33 + app.post(url,params).then(r=>{
  34 + that.setData({
  35 + getting: false
  36 + })
  37 + let interval = setInterval(()=>{
  38 + that.setData({
  39 + code: code
  40 + })
  41 + code--;
  42 + if (code == 0) {
  43 + that.setData({
  44 + getting: true,
  45 + code: 60
  46 + })
  47 + clearInterval(interval);
  48 + }
  49 + },1000)
  50 + })
  51 + }
  52 + },
  53 + inputCode(e){
  54 + let type = e.currentTarget.dataset.type;
  55 + this.data.params[type]=e.detail.value;
  56 + this.setData({
  57 + params:this.data.params
  58 + })
  59 + },
  60 + subBand(){
  61 + let phone = this.data.params.mobile, url ='/user/Profile/bind_new_mobile';
  62 + if (!(/^1[3456789]\d{9}$/.test(phone))) {
  63 + wx.showToast({
  64 + title: '请输入正确的手机号',
  65 + icon: 'none'
  66 + })
  67 + } else {
  68 + app.post(url, this.data.params).then(r => {
  69 + wx.showToast({
  70 + title: '换绑手机号成功',
  71 + icon:'none'
  72 + })
  73 + setTimeout(()=>{
  74 + wx.navigateBack({
  75 +
  76 + })
  77 + },1500)
  78 +
  79 + })
  80 + }
  81 + },
17 82
18 /** 83 /**
19 * 生命周期函数--监听页面初次渲染完成 84 * 生命周期函数--监听页面初次渲染完成
1 <view class="bangshouji"> 1 <view class="bangshouji">
2 - <view class="huanbangleft">  
3 - <input password type="number" placeholder='请输入手机号' placeholder-class='enterphone'/>  
4 - </view>  
5 -  
6 - <view class="huanbangright">获取验证码</view> 2 + <view class="huanbangleft">
  3 + <input type="number" placeholder='请输入手机号' placeholder-class='enterphone' maxlength='11' bindinput='inputCode' data-type='mobile' />
  4 + </view>
  5 + <view class="huanbangright" bindtap='getCode' wx:if='{{getting}}' >获取验证码</view>
  6 + <view class="huanbangright" wx:else>{{code}}S</view>
7 </view> 7 </view>
8 -  
9 <view class="bangshouji enteryan"> 8 <view class="bangshouji enteryan">
10 - <input password type="number" placeholder='请输入验证码' placeholder-class='enterphone'/> 9 + <input type="number" placeholder='请输入验证码' maxlength='6' placeholder-class='enterphone' value='{{verification_code}}' bindinput='inputCode' data-type='verification_code' />
11 </view> 10 </view>
  11 +
  12 +<view class='sub_btn' wx:if='{{!params.verification_code}}'>
  13 + 验证后绑定新手机号
  14 +</view>
  15 +
  16 +<view class='sub_btn active' wx:else bindtap='subBand'>
  17 + 确认绑定
  18 +</view>
@@ -53,4 +53,20 @@ page{ @@ -53,4 +53,20 @@ page{
53 margin-top:32rpx; 53 margin-top:32rpx;
54 color:#1A1A1A; 54 color:#1A1A1A;
55 font-size: 30rpx; 55 font-size: 30rpx;
  56 +}
  57 +.sub_btn{
  58 + width: 540rpx;
  59 + height: 100rpx;
  60 + background: #CCC;
  61 + font-size: 30rpx;
  62 + margin: 0 auto;
  63 + margin-top: 130rpx;
  64 + color: #FFF;
  65 + border-radius: 50rpx;
  66 + align-items: center;
  67 + display: flex;
  68 + justify-content: center;
  69 +}
  70 +.sub_btn.active{
  71 + background: #E81825;
56 } 72 }
  1 +// pages/myblock/jiupin/jiupin.js
  2 +const app = getApp();
  3 +Page({
  4 +
  5 + /**
  6 + * 页面的初始数据
  7 + */
  8 + data: {
  9 + page:1,
  10 + noData: true,
  11 + noMore: false,
  12 + list:[]
  13 + },
  14 +
  15 + /**
  16 + * 生命周期函数--监听页面加载
  17 + */
  18 + onLoad: function (options) {
  19 + this.getList();
  20 + },
  21 + getList() {
  22 + let url = 'user/Center/favorite_wine' , params = {
  23 + page: this.data.page
  24 + };
  25 + app.post(url, params).then(r => {
  26 + var list = this.data.page == 1 ? r.list : this.data.list.concat(r.list);
  27 + this.setData({
  28 + list: list,
  29 + totalPage: r.total_page,
  30 + noData: list.length > 0 ? true : false,
  31 + noMore: r.totalPage == r.page ? !0 : !1
  32 + })
  33 + })
  34 + },
  35 +
  36 + /**
  37 + * 生命周期函数--监听页面初次渲染完成
  38 + */
  39 + onReady: function () {
  40 +
  41 + },
  42 +
  43 + /**
  44 + * 生命周期函数--监听页面显示
  45 + */
  46 + onShow: function () {
  47 +
  48 + },
  49 +
  50 + /**
  51 + * 生命周期函数--监听页面隐藏
  52 + */
  53 + onHide: function () {
  54 +
  55 + },
  56 +
  57 + /**
  58 + * 生命周期函数--监听页面卸载
  59 + */
  60 + onUnload: function () {
  61 +
  62 + },
  63 +
  64 + /**
  65 + * 页面相关事件处理函数--监听用户下拉动作
  66 + */
  67 + onPullDownRefresh: function () {
  68 +
  69 + },
  70 +
  71 + /**
  72 + * 页面上拉触底事件的处理函数
  73 + */
  74 + onReachBottom: function () {
  75 + !this.data.noMore ?(this.setData({
  76 + page: page + 1
  77 + }), this.list()) : wx.showToast({
  78 + title: '没有更多了',
  79 + icon: 'none'
  80 + })
  81 + },
  82 +
  83 + /**
  84 + * 用户点击右上角分享
  85 + */
  86 + onShareAppMessage: function () {
  87 +
  88 + }
  89 +})
  1 +{
  2 + "usingComponents": {},
  3 + "navigationBarTitleText": "酒品"
  4 +}
  1 +<view class='list_box'>
  2 + <view class="searchitem" wx:for='{{list}}' wx:key=''>
  3 + <view class="searchitemleft">
  4 + <view class="itemleftimg">
  5 + <image src="{{item.logo}}"></image>
  6 + </view>
  7 + <view class="itemiddle">
  8 + <view class="itemidelename">{{item.name}}</view>
  9 + <view class="nambottom">
  10 + <text class="namebottomitem">{{item.degree_name}}</text>
  11 + <text class="namebottomitem">{{item.odor_name}}</text>
  12 + <text class="namebottomitem">{{item.price}}</text>
  13 + <text class="namebottomitem">{{item.ml}}</text>
  14 + </view>
  15 + </view>
  16 + </view>
  17 + <view class="starimg">
  18 + <!-- aicon_010x.png -->
  19 + <image src="{{item.is_favorite==0?'/img/aicon_09.png':'/img/aicon_10.png'}}"></image>
  20 + </view>
  21 + </view>
  22 +</view>
  23 +
  24 +
  25 +<view class='showall' wx:if='{{noMore&&noData}}'>已显示全部内容</view>
  26 +<view class='noData' wx:if='{{!noData}}'>
  27 + 暂无相关数据
  28 +</view>
  1 +/* pages/myblock/jiupin/jiupin.wxss */
  2 +@import '../../homeblock/search/search.wxss';
  1 +// pages/myblock/message/message.js
  2 +const formMate = require('../../../utils/util.js');
  3 +const app = getApp();
  4 +Page({
  5 +
  6 + /**
  7 + * 页面的初始数据
  8 + */
  9 + data: {
  10 + page: 1,
  11 + list: [],
  12 + noData: true,
  13 + noMore: !1,
  14 + },
  15 + /**
  16 + * 生命周期函数--监听页面加载
  17 + */
  18 + onLoad: function (options) {
  19 + this.getList();
  20 + },
  21 + getList() {
  22 + let url = 'user/Center/my_message', params = {
  23 + page: this.data.page
  24 + };
  25 + app.post(url, params).then(r => {
  26 + for(var obj of r.list){
  27 + obj.create_time = formMate.formatTime(new Date(obj.create_time))
  28 + }
  29 + var list = this.data.page == 1 ? r.list : this.data.list.concat(r.list);
  30 + this.setData({
  31 + list: list,
  32 + totalPage: r.total_page,
  33 + noData: list.length > 0 ? true : false,
  34 + noMore: r.totalPage == r.page ? !0 : !1
  35 + })
  36 + })
  37 + },
  38 +
  39 + /**
  40 + * 生命周期函数--监听页面初次渲染完成
  41 + */
  42 + onReady: function () {
  43 +
  44 + },
  45 +
  46 + /**
  47 + * 生命周期函数--监听页面显示
  48 + */
  49 + onShow: function () {
  50 +
  51 + },
  52 +
  53 + /**
  54 + * 生命周期函数--监听页面隐藏
  55 + */
  56 + onHide: function () {
  57 +
  58 + },
  59 +
  60 + /**
  61 + * 生命周期函数--监听页面卸载
  62 + */
  63 + onUnload: function () {
  64 +
  65 + },
  66 +
  67 + /**
  68 + * 页面相关事件处理函数--监听用户下拉动作
  69 + */
  70 + onPullDownRefresh: function () {
  71 +
  72 + },
  73 +
  74 + /**
  75 + * 页面上拉触底事件的处理函数
  76 + */
  77 + onReachBottom: function () {
  78 + this.data.page < this.data.totalPage ? this.list()
  79 + : wx.showToast({
  80 + title: '没有更多了',
  81 + icon: 'none'
  82 + })
  83 + },
  84 +
  85 + /**
  86 + * 用户点击右上角分享
  87 + */
  88 + onShareAppMessage: function () {
  89 +
  90 + }
  91 +})
  1 +{
  2 + "usingComponents": {},
  3 + "navigationBarTitleText": "消息通知"
  4 +}
  1 +<!--pages/myblock/message/message.wxml-->
  2 +<view class='message_list'>
  3 + <view class='message_item' wx:for='{{list}}' wx:key=''>
  4 + <view class='time'>{{item.create_time}}</view>
  5 + <view class='message_content'>
  6 + {{item.content}}
  7 + </view>
  8 + </view>
  9 +</view>
  1 +/* pages/myblock/message/message.wxss */
  2 +page{
  3 + background: #F2F2F2;
  4 +}
  5 +.message_item{
  6 +
  7 +}
  8 +.message_item .time{
  9 + color: #999999;
  10 + font-size: 24rpx;
  11 + text-align: center;
  12 + padding: 36rpx 0;
  13 +
  14 +}
  15 +.message_content{
  16 + margin: 0 67rpx;
  17 + padding: 38rpx 44rpx;
  18 + background-color: #FFF;
  19 + font-size:26rpx;
  20 + color: #333;
  21 + border-radius: 5rpx;
  22 +}
@@ -12,9 +12,10 @@ Page({ @@ -12,9 +12,10 @@ Page({
12 sexarray:['男','女'], 12 sexarray:['男','女'],
13 birthday:'', 13 birthday:'',
14 reginname: '北京 北京市 东城区', 14 reginname: '北京 北京市 东城区',
15 - region: ['北京', '北京市', '东城区'] 15 + region: ['北京', '北京市', '东城区'],
  16 + xingzuo:['']
16 }, 17 },
17 - 18 +
18 /** 19 /**
19 * 生命周期函数--监听页面加载 20 * 生命周期函数--监听页面加载
20 */ 21 */
@@ -24,20 +25,75 @@ Page({ @@ -24,20 +25,75 @@ Page({
24 25
25 birthday: app.newnowDate() 26 birthday: app.newnowDate()
26 }) 27 })
  28 + this.getUserInfo();
  29 + },
  30 + uploadImg(e){
  31 + let that = this;
  32 + wx.chooseImage({
  33 + count: 1,
  34 + sizeType: [],
  35 + sourceType: [],
  36 + success: function(res) {
  37 + wx.uploadFile({
  38 + url: app.globalData.baseUrl +'/user/upload/one',
  39 + filePath: res.tempFilePaths[0],
  40 + name: 'file',
  41 + header: {
  42 + 'XX-Token':wx.getStorageSync('token'),
  43 + 'XX-Device-Type':'wxapp'
  44 + },
  45 + formData: {
  46 + file: res.tempFilePaths[0]
  47 + },
  48 + success: function(res) {
  49 + let data = JSON.parse(res.data)
  50 +
  51 + that.setData({
  52 + 'userInfo.avatar': data.data.url
  53 + });
  54 + that.saveUserInfo();
  55 + },
  56 + fail: function(res) {},
  57 + complete: function(res) {},
  58 + })
  59 + },
  60 + fail: function(res) {},
  61 + complete: function(res) {},
  62 + })
  63 + },
  64 + getUserInfo(){
  65 + let url = '/user/Center/get_userinfo';
  66 + app.post(url,{}).then(r=>{
  67 + this.setData({
  68 + userInfo: r,
  69 + sexindex: r.sex == 1 ?0:2,
  70 + sexname: r.sex == 1?'男':'女'
  71 + })
  72 + })
  73 + },
  74 + saveUserInfo(){
  75 + let url = 'user/Center/set_userinfo';
  76 + app.post(url,this.data.userInfo).then(r=>{})
  77 + },
  78 + inputUserInfo(e){
  79 + let type = e.currentTarget.dataset.type;
  80 + this.data.userInfo[type] = e.detail.value
  81 + this.setData({
  82 + userInfo: this.data.userInfo
  83 + });
  84 + this.saveUserInfo();
27 }, 85 },
28 bindhospitaltypeChange(e) { 86 bindhospitaltypeChange(e) {
29 let that = this; 87 let that = this;
30 that.setData({ 88 that.setData({
31 -  
32 sexindex: e.detail.value, 89 sexindex: e.detail.value,
33 - sexname: that.data.sexarray[e.detail.value]  
34 - 90 + sexname: that.data.sexarray[e.detail.value],
  91 + 'userInfo.sex': that.data.sexarray[e.detail.value]=='男'?1:2
35 }) 92 })
36 }, 93 },
37 94
38 //生日选择 95 //生日选择
39 bindDateChange: function (e) { 96 bindDateChange: function (e) {
40 -  
41 this.setData({ 97 this.setData({
42 birthday: e.detail.value 98 birthday: e.detail.value
43 }) 99 })
1 <view class="headtop"> 1 <view class="headtop">
2 <view class="headtopitem"> 2 <view class="headtopitem">
3 <view class="headtopleft">我的头像</view> 3 <view class="headtopleft">我的头像</view>
4 - <view class="touxiang">  
5 - <image src="{{url}}/aicon_77@2x.png"></image> 4 + <view class="touxiang" bindtap='uploadImg'>
  5 + <image src="{{userInfo.avatar}}"></image>
6 </view> 6 </view>
7 </view> 7 </view>
8 8
9 <view class="headtopitem"> 9 <view class="headtopitem">
10 <view class="headtopleft">昵称</view> 10 <view class="headtopleft">昵称</view>
11 <view class="entername"> 11 <view class="entername">
12 - <input placeholder='请输入昵称' placeholder-class='enterming' /> 12 + <input placeholder='请输入昵称' placeholder-class='enterming' value='{{userInfo.user_nickname}}' bindinput='inputUserInfo' data-type='user_nickname' />
13 </view> 13 </view>
14 </view> 14 </view>
15 15
@@ -34,91 +34,78 @@ @@ -34,91 +34,78 @@
34 </view> 34 </view>
35 <view class="headtopitem"> 35 <view class="headtopitem">
36 <view class="headtopleft">生日</view> 36 <view class="headtopleft">生日</view>
37 - <picker mode="date" value="{{date}}" start="2015-09-01" end="2017-09-01" bindchange="bindDateChange">  
38 - 37 + <picker mode="date" value="{{userInfo.birthday}}" bindchange="bindDateChange">
39 <view class="selectoption"> 38 <view class="selectoption">
40 <view class="sexname"> 39 <view class="sexname">
41 {{birthday}} 40 {{birthday}}
42 </view> 41 </view>
43 -  
44 <view class="rowimg"> 42 <view class="rowimg">
45 <image src="/img/aicon_61.png"></image> 43 <image src="/img/aicon_61.png"></image>
46 </view> 44 </view>
47 </view> 45 </view>
48 -  
49 </picker> 46 </picker>
50 </view> 47 </view>
51 <view class="headtopitem"> 48 <view class="headtopitem">
52 <view class="headtopleft">地区</view> 49 <view class="headtopleft">地区</view>
53 - <picker mode="region" bindchange="bindRegionChange" value="{{region}}" custom-item="{{customItem}}">  
54 - 50 + <picker mode="region" bindchange="bindRegionChange" value="{{userInfo.region}}" custom-item="{{customItem}}">
55 <view class="selectoption"> 51 <view class="selectoption">
56 <view class="sexname"> 52 <view class="sexname">
57 {{reginname}} 53 {{reginname}}
58 </view> 54 </view>
59 -  
60 <view class="rowimg"> 55 <view class="rowimg">
61 <image src="/img/aicon_61.png"></image> 56 <image src="/img/aicon_61.png"></image>
62 </view> 57 </view>
63 </view> 58 </view>
64 -  
65 </picker> 59 </picker>
66 </view> 60 </view>
67 <view class="headtopitem"> 61 <view class="headtopitem">
68 <view class="headtopleft">个人签名</view> 62 <view class="headtopleft">个人签名</view>
69 <view class="entername qianming"> 63 <view class="entername qianming">
70 - <input placeholder='请输入个性签名' placeholder-class='enterming' /> 64 + <input placeholder='请输入个性签名' placeholder-class='enterming' value='{{userInfo.sign}}' bindinput='inputUserInfo' data-type='sign' />
71 </view> 65 </view>
72 </view> 66 </view>
73 -  
74 </view> 67 </view>
75 68
76 <view class="headtop"> 69 <view class="headtop">
77 <view class="headtopitem"> 70 <view class="headtopitem">
78 <view class="headtopleft">星座</view> 71 <view class="headtopleft">星座</view>
79 <view class="entername"> 72 <view class="entername">
80 - <input placeholder='请输入星座' placeholder-class='enterming' /> 73 + <input placeholder='请输入星座' placeholder-class='enterming' value='{{userInfo.constellation}}' bindinput='getUserInfo' data-type='constellation' />
81 </view> 74 </view>
82 </view> 75 </view>
83 -  
84 <view class="headtopitem"> 76 <view class="headtopitem">
85 <view class="headtopleft">身高</view> 77 <view class="headtopleft">身高</view>
86 <view class="entername"> 78 <view class="entername">
87 - <input placeholder='请输入身高' placeholder-class='enterming' /> 79 + <input placeholder='请输入身高' placeholder-class='enterming' value='{{userInfo.height}}' bindinput='inputUserInfo' data-type='height'/>
88 </view> 80 </view>
89 </view> 81 </view>
90 -  
91 <view class="headtopitem"> 82 <view class="headtopitem">
92 <view class="headtopleft">体重</view> 83 <view class="headtopleft">体重</view>
93 <view class="entername"> 84 <view class="entername">
94 - <input placeholder='请输入体重' placeholder-class='enterming' /> 85 + <input placeholder='请输入体重' placeholder-class='enterming' value='{{userInfo.weight}}' bindinput='inputUserInfo' data-type='weight'/>
95 </view> 86 </view>
96 </view> 87 </view>
97 -  
98 -  
99 </view> 88 </view>
100 89
101 <view class="headtop"> 90 <view class="headtop">
102 <view class="headtopitem"> 91 <view class="headtopitem">
103 <view class="headtopleft">职业</view> 92 <view class="headtopleft">职业</view>
104 <view class="entername"> 93 <view class="entername">
105 - <input placeholder='请输入职业' placeholder-class='enterming' /> 94 + <input placeholder='请输入职业' placeholder-class='enterming' value='{{userInfo.major}}' bindinput='inputUserInfo' data-type='major'/>
106 </view> 95 </view>
107 </view> 96 </view>
108 97
109 <view class="headtopitem"> 98 <view class="headtopitem">
110 <view class="headtopleft">收入</view> 99 <view class="headtopleft">收入</view>
111 <view class="entername"> 100 <view class="entername">
112 - <input placeholder='请输入收入' placeholder-class='enterming' /> 101 + <input placeholder='请输入收入' placeholder-class='enterming' value='{{userInfo.income}}' bindinput='inputUserInfo' data-type='income'/>
113 </view> 102 </view>
114 </view> 103 </view>
115 104
116 <view class="headtopitem"> 105 <view class="headtopitem">
117 <view class="headtopleft">兴趣爱好</view> 106 <view class="headtopleft">兴趣爱好</view>
118 <view class="entername"> 107 <view class="entername">
119 - <input placeholder='请输入兴趣爱好' placeholder-class='enterming' /> 108 + <input placeholder='请输入兴趣爱好' placeholder-class='enterming' value='{{userInfo.interest}}' bindinput='inputUserInfo' data-type='interest'/>
120 </view> 109 </view>
121 </view> 110 </view>
122 -  
123 -  
124 </view> 111 </view>
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 text-align: right 35 text-align: right
36 } 36 }
37 .enterming{ 37 .enterming{
38 - color:#999999; 38 + color:#666;
39 font-size:28rpx; 39 font-size:28rpx;
40 text-align: right 40 text-align: right
41 } 41 }
@@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@
47 height:48rpx; 47 height:48rpx;
48 line-height: 48rpx; 48 line-height: 48rpx;
49 text-align: right; 49 text-align: right;
50 - color:#999999; 50 + color:#666;
51 font-size:28rpx; 51 font-size:28rpx;
52 margin-right:22rpx; 52 margin-right:22rpx;
53 53
@@ -60,4 +60,7 @@ @@ -60,4 +60,7 @@
60 .selectoption{ 60 .selectoption{
61 display:flex; 61 display:flex;
62 align-items: center; 62 align-items: center;
  63 +}
  64 +input{
  65 + color: #666
63 } 66 }
  1 +// pages/myblock/jiupin/jiupin.js
  2 +const app = getApp();
  3 +Page({
  4 +
  5 + /**
  6 + * 页面的初始数据
  7 + */
  8 + data: {
  9 + page: 1,
  10 + noData: true,
  11 + noMore: false,
  12 + list: []
  13 + },
  14 +
  15 + /**
  16 + * 生命周期函数--监听页面加载
  17 + */
  18 + onLoad: function (options) {
  19 + this.getList();
  20 + },
  21 + collect(e) {
  22 + let id = e.currentTarget.id, url = '/index/Common/favorite', index = e.currentTarget.dataset.index, params = {
  23 + sort: 2,
  24 + id: id
  25 + };
  26 + app.post(url, params).then(r => {
  27 + this.data.list.splice(index,1);
  28 + wx.showToast({
  29 + title: '操作成功',
  30 + icon:'none',
  31 + duration: 1300
  32 + })
  33 + this.setData({
  34 + list: this.data.list
  35 + })
  36 + })
  37 + },
  38 + getList() {
  39 + let url = 'user/Center/favorite_brand', params = {
  40 + page: this.data.page
  41 + };
  42 + app.post(url, params).then(r => {
  43 + var list = this.data.page == 1 ? r.list : this.data.list.concat(r.list);
  44 + this.setData({
  45 + list: list,
  46 + totalPage: r.total_page,
  47 + noData: list.length > 0 ? true : false,
  48 + noMore: r.totalPage == r.page ? !0 : !1
  49 + })
  50 + })
  51 + },
  52 + /**
  53 + * 生命周期函数--监听页面初次渲染完成
  54 + */
  55 + onReady: function () {
  56 +
  57 + },
  58 + /**
  59 + * 生命周期函数--监听页面显示
  60 + */
  61 + onShow: function () {
  62 +
  63 + },
  64 + /**
  65 + * 生命周期函数--监听页面隐藏
  66 + */
  67 + onHide: function () {
  68 +
  69 + },
  70 + /**
  71 + * 生命周期函数--监听页面卸载
  72 + */
  73 + onUnload: function () {
  74 +
  75 + },
  76 + /**
  77 + * 页面相关事件处理函数--监听用户下拉动作
  78 + */
  79 + onPullDownRefresh: function () {
  80 +
  81 + },
  82 + /**
  83 + * 页面上拉触底事件的处理函数
  84 + */
  85 + onReachBottom: function () {
  86 + !this.data.noMore ? (this.setData({
  87 + page: page + 1
  88 + }), this.list()) : wx.showToast({
  89 + title: '没有更多了',
  90 + icon: 'none'
  91 + })
  92 + },
  93 + /**
  94 + * 用户点击右上角分享
  95 + */
  96 + onShareAppMessage: function () {
  97 +
  98 + }
  99 +})
  1 +{
  2 + "usingComponents": {},
  3 + "navigationBarTitleText": "品牌"
  4 +}
  1 +<view class='list_box'>
  2 + <view class="searchitem" wx:for='{{list}}' wx:key=''>
  3 + <view class="searchitemleft">
  4 + <view class="itemleftimg">
  5 + <image src="{{item.logo}}" mode='widthFix'></image>
  6 + </view>
  7 + <view class="itemiddle">
  8 + <view class="itemidelename">{{item.name}}</view>
  9 + <view class="nambottom">
  10 + <text class="namebottomitem">{{item.sort_name}}</text>
  11 + <text class="namebottomitem">{{item.country}}</text>
  12 + <text class="namebottomitem">{{item.city}}</text>
  13 + <text class="namebottomitem">{{item.odor_name}}</text>
  14 + </view>
  15 + </view>
  16 + </view>
  17 + <view class="starimg" id='{{item.id}}' data-index='{{index}}' bindtap='collect'>
  18 + <!-- aicon_010x.png -->
  19 + <image src="{{item.is_favorite==0?'/img/aicon_09.png':'/img/aicon_10.png'}}"></image>
  20 + </view>
  21 + </view>
  22 +</view>
  23 +
  24 +
  25 +<view class='showall' wx:if='{{noMore&&noData}}'>已显示全部内容</view>
  26 +<view class='noData' wx:if='{{!noData}}'>
  27 + 暂无相关数据
  28 +</view>
  1 +/* pages/myblock/jiupin/jiupin.wxss */
  2 +@import '../../homeblock/search/search.wxss';
  1 +// pages/myblock/rule/rule.js
  2 +let WxParse = require('../../../wxParse/wxParse.js');
  3 +const app = getApp();
  4 +Page({
  5 +
  6 + /**
  7 + * 页面的初始数据
  8 + */
  9 + data: {
  10 +
  11 + },
  12 +
  13 + /**
  14 + * 生命周期函数--监听页面加载
  15 + */
  16 + onLoad: function (options) {
  17 + this.getRule();
  18 + },
  19 + getRule(){
  20 + let url = '/index/Common/protocol';
  21 + app.post(url,{}).then(r=>{
  22 + WxParse.wxParse('contentHtml', 'html', r.content, this, 5)
  23 + })
  24 + },
  25 +
  26 + /**
  27 + * 生命周期函数--监听页面初次渲染完成
  28 + */
  29 + onReady: function () {
  30 +
  31 + },
  32 +
  33 + /**
  34 + * 生命周期函数--监听页面显示
  35 + */
  36 + onShow: function () {
  37 +
  38 + },
  39 +
  40 + /**
  41 + * 生命周期函数--监听页面隐藏
  42 + */
  43 + onHide: function () {
  44 +
  45 + },
  46 +
  47 + /**
  48 + * 生命周期函数--监听页面卸载
  49 + */
  50 + onUnload: function () {
  51 +
  52 + },
  53 +
  54 + /**
  55 + * 页面相关事件处理函数--监听用户下拉动作
  56 + */
  57 + onPullDownRefresh: function () {
  58 +
  59 + },
  60 +
  61 + /**
  62 + * 页面上拉触底事件的处理函数
  63 + */
  64 + onReachBottom: function () {
  65 +
  66 + },
  67 +
  68 + /**
  69 + * 用户点击右上角分享
  70 + */
  71 + onShareAppMessage: function () {
  72 +
  73 + }
  74 +})
  1 +{
  2 + "usingComponents": {},
  3 + "navigationBarTitleText": "协议规则"
  4 +}
  1 +<!--pages/myblock/rule/rule.wxml-->
  2 +<view class='content'>
  3 + <import src="/wxParse/wxParse.wxml" />
  4 + <template is="wxParse" data="{{wxParseData:contentHtml.nodes}}" />
  5 + </view>
  1 +/* pages/myblock/rule/rule.wxss */
  2 +.content{
  3 + font-size: 30rpx;
  4 + padding: 30rpx;
  5 + color: #666;
  6 +}
@@ -18,7 +18,32 @@ Page({ @@ -18,7 +18,32 @@ Page({
18 }) 18 })
19 19
20 }, 20 },
21 - 21 + inputPass(e){
  22 + this.setData({
  23 + password: e.detail.value
  24 + })
  25 + },
  26 + confirmPassWord(){
  27 + let params = {
  28 + password: this.data.password
  29 + }, url ='/user/Profile/set_password';
  30 + if(params.password.length<6){
  31 + wx.showToast({
  32 + title: '请输入6位数以上的密码',
  33 + })
  34 + }else{
  35 + app.post(url,params).then(r=>{
  36 + wx.showToast({
  37 + title: '设置成功',
  38 + duration: 1300
  39 + })
  40 + setTimeout(()=>{
  41 + wx.navigateBack({
  42 + })
  43 + },1200)
  44 + })
  45 + }
  46 + },
22 /** 47 /**
23 * 生命周期函数--监听页面初次渲染完成 48 * 生命周期函数--监听页面初次渲染完成
24 */ 49 */
1 <view class="setmima"> 1 <view class="setmima">
2 <view class="setmimaleft"> 2 <view class="setmimaleft">
3 - <input placeholder='设置密码' placeholder-class='shemi'/>  
4 - 3 + <input password placeholder='设置密码' bindinput='inputPass' />
5 </view> 4 </view>
6 <view class="mimaeye"> 5 <view class="mimaeye">
7 <image src="{{url}}/bicon_14x.png"></image> 6 <image src="{{url}}/bicon_14x.png"></image>
8 </view> 7 </view>
9 </view> 8 </view>
10 -  
11 -<view class="que">确认</view>  
12 - 9 +<view class="que" bindtap='confirmPassWord'>确认</view>
13 <view class="needmi">需要有6-20位数字、字母或符号组成，至少两种</view> 10 <view class="needmi">需要有6-20位数字、字母或符号组成，至少两种</view>
14 -  
15 -<view class="mimasuccess">密码设置成功</view>  
1 // pages/myblock/zhanghaobangding/zhanghaobangding.js 1 // pages/myblock/zhanghaobangding/zhanghaobangding.js
  2 +const app = getApp();
2 Page({ 3 Page({
3 4
4 /** 5 /**
5 * 页面的初始数据 6 * 页面的初始数据
6 */ 7 */
7 data: { 8 data: {
8 - 9 + info:{}
9 }, 10 },
10 -  
11 /** 11 /**
12 * 生命周期函数--监听页面加载 12 * 生命周期函数--监听页面加载
13 */ 13 */
14 onLoad: function (options) { 14 onLoad: function (options) {
15 - 15 + this.getBindInfo();
16 }, 16 },
  17 + getBindInfo(){
  18 + let url = '/user/Center/user_bind';
  19 + app.post(url,{}).then(r=>{
  20 + this.setData({
  21 + info:r
  22 + })
  23 + })
  24 + },
  25 + changeBind(){
  26 + wx.showToast({
  27 + title: '由于功能限制请前往APP进行相关操作',
  28 + icon: 'none'
  29 + })
  30 + },
  31 + getUserInfo(e){
17 32
  33 + },
18 /** 34 /**
19 * 生命周期函数--监听页面初次渲染完成 35 * 生命周期函数--监听页面初次渲染完成
20 */ 36 */
1 <view class="zhanghao"> 1 <view class="zhanghao">
2 <view class="zhanghaoitem"> 2 <view class="zhanghaoitem">
3 <view class="zhanghaoleft">手机号绑定</view> 3 <view class="zhanghaoleft">手机号绑定</view>
4 - <view class="zhanghaoright">  
5 - <view class="zhanghaoname">136****7686</view> 4 + <navigator class="zhanghaoright" url='/pages/myblock/huanbangshouji/huanbangshouji'>
  5 + <view class="zhanghaoname">{{info.mobile}}</view>
6 <view class="rowimg"> 6 <view class="rowimg">
7 <image src="/img/aicon_61.png"></image> 7 <image src="/img/aicon_61.png"></image>
8 </view> 8 </view>
9 - </view>  
10 - 9 + </navigator>
11 </view> 10 </view>
12 11
13 <view class="zhanghaoitem"> 12 <view class="zhanghaoitem">
14 <view class="zhanghaoleft">微信绑定</view> 13 <view class="zhanghaoleft">微信绑定</view>
15 -  
16 - <view class="zhanghaoright">  
17 - <view class="zhanghaoname">好时光</view> 14 + <view class="zhanghaoright" bindtap='changeBind'>
  15 + <view class="zhanghaoname" wx:if='{{info.wechat}}'>{{info.wechat}}</view>
  16 + <view class="zhanghaoname bangname" wx:else>去绑定</view>
18 <view class="rowimg"> 17 <view class="rowimg">
19 <image src="/img/aicon_61.png"></image> 18 <image src="/img/aicon_61.png"></image>
20 </view> 19 </view>
  20 +
21 </view> 21 </view>
22 </view> 22 </view>
23 <view class="zhanghaoitem"> 23 <view class="zhanghaoitem">
24 <view class="zhanghaoleft">QQ绑定</view> 24 <view class="zhanghaoleft">QQ绑定</view>
25 -  
26 - <view class="zhanghaoright">  
27 - <view class="zhanghaoname bangname">去绑定</view> 25 + <view class="zhanghaoright" bindtap='changeBind'>
  26 + <view class="zhanghaoname" wx:if='{{info.qq}}'>{{info.qq}}</view>
  27 + <view class="zhanghaoname bangname" wx:else>去绑定</view>
28 <view class="rowimg"> 28 <view class="rowimg">
29 <image src="/img/aicon_61.png"></image> 29 <image src="/img/aicon_61.png"></image>
30 </view> 30 </view>
@@ -33,8 +33,9 @@ @@ -33,8 +33,9 @@
33 <view class="zhanghaoitem"> 33 <view class="zhanghaoitem">
34 <view class="zhanghaoleft">新浪微博绑定</view> 34 <view class="zhanghaoleft">新浪微博绑定</view>
35 35
36 - <view class="zhanghaoright">  
37 - <view class="zhanghaoname bangname">去绑定</view> 36 + <view class="zhanghaoright" bindtap='changeBind'>
  37 + <view class="zhanghaoname" wx:if='{{info.weibo}}'>{{info.weibo}}</view>
  38 + <view class="zhanghaoname bangname" wx:else>去绑定</view>
38 <view class="rowimg"> 39 <view class="rowimg">
39 <image src="/img/aicon_61.png"></image> 40 <image src="/img/aicon_61.png"></image>
40 </view> 41 </view>
@@ -34,6 +34,15 @@ page{ @@ -34,6 +34,15 @@ page{
34 .zhanghaoright{ 34 .zhanghaoright{
35 display:flex; 35 display:flex;
36 align-items: center; 36 align-items: center;
  37 + position: relative;
  38 +}
  39 +.authInfo{
  40 + position: absolute;
  41 + top: 0;
  42 + left: 0;
  43 + width: 100%;
  44 + height: 100%;
  45 + opacity: 0;
37 } 46 }
38 .zhanghaoname{ 47 .zhanghaoname{
39 color:#999999; 48 color:#999999;
1 <view class="zhanghao"> 1 <view class="zhanghao">
2 - <view class="zhanghaoitem"> 2 + <navigator class="zhanghaoitem" url='/pages/myblock/zhanghaobangding/zhanghaobangding'>
3 <view class="zhanghaoleft">账号绑定</view> 3 <view class="zhanghaoleft">账号绑定</view>
4 -  
5 <view class="rowimg"> 4 <view class="rowimg">
6 <image src="/img/aicon_61.png"></image> 5 <image src="/img/aicon_61.png"></image>
7 </view> 6 </view>
8 - </view> 7 + </navigator>
9 8
10 - <view class="zhanghaoitem"> 9 + <navigator class="zhanghaoitem" url='/pages/myblock/shezhimima/shezhimima'>
11 <view class="zhanghaoleft">设置密码</view> 10 <view class="zhanghaoleft">设置密码</view>
12 11
13 <view class="rowimg"> 12 <view class="rowimg">
14 <image src="/img/aicon_61.png"></image> 13 <image src="/img/aicon_61.png"></image>
15 </view> 14 </view>
16 - </view> 15 + </navigator>
17 </view> 16 </view>
18 <view class="question">常见问题</view> 17 <view class="question">常见问题</view>
  1 +// pages/setmima/setmima.js
  2 +const app=getApp()
  3 +Page({
  4 +
  5 + /**
  6 + * 页面的初始数据
  7 + */
  8 + data: {
  9 + url:'',
  10 + password:'',
  11 + currentTime: 60,
  12 + time: '',
  13 + },
  14 +
  15 + /**
  16 + * 生命周期函数--监听页面加载
  17 + */
  18 + onLoad: function (options) {
  19 + this.setData({
  20 + url: app.globalData.url
  21 + })
  22 +
  23 + },
  24 +
  25 + shezhimima(e){
  26 +
  27 + this.setData({
  28 + password: e.detail.value
  29 + })
  30 +
  31 +
  32 + },
  33 +
  34 + queding(){
  35 + let that = this;
  36 + let value=that.data.password;
  37 + if (value.length < 6 || value.length > 20) {
  38 + wx.showToast({
  39 + title: '请输入6-20位的密码',
  40 + icon: 'none'
  41 + })
  42 + } else {
  43 +
  44 +
  45 +
  46 + let url = 'user/Profile/set_password', params = {
  47 + password:value
  48 + }
  49 + app.post(url, params).then((res) => {
  50 + console.log(res);
  51 + wx.showToast({
  52 + title: '设置密码成功',
  53 + icon:"none"
  54 + })
  55 +
  56 + setTimeout(function(){
  57 + wx.switchTab({
  58 + url: '/pages/homapage/homepage',
  59 + })
  60 + },1500)
  61 +
  62 +
  63 +
  64 + }).catch((err) => {
  65 +
  66 + })
  67 + }
  68 + },
  69 +
  70 +
  71 +
  72 +
  73 + /**
  74 + * 生命周期函数--监听页面初次渲染完成
  75 + */
  76 + onReady: function () {
  77 +
  78 + },
  79 +
  80 + /**
  81 + * 生命周期函数--监听页面显示
  82 + */
  83 + onShow: function () {
  84 +
  85 + },
  86 +
  87 + /**
  88 + * 生命周期函数--监听页面隐藏
  89 + */
  90 + onHide: function () {
  91 +
  92 + },
  93 +
  94 + /**
  95 + * 生命周期函数--监听页面卸载
  96 + */
  97 + onUnload: function () {
  98 +
  99 + },
  100 +
  101 + /**
  102 + * 页面相关事件处理函数--监听用户下拉动作
  103 + */
  104 + onPullDownRefresh: function () {
  105 +
  106 + },
  107 +
  108 + /**
  109 + * 页面上拉触底事件的处理函数
  110 + */
  111 + onReachBottom: function () {
  112 +
  113 + },
  114 +
  115 + /**
  116 + * 用户点击右上角分享
  117 + */
  118 + onShareAppMessage: function () {
  119 +
  120 + }
  121 +})
  1 +{
  2 + "navigationBarTitleText": "设置密码"
  3 +}
  1 +
  2 +<view class="shemima">设置密码后你可以用手机号和密码登录</view>
  3 +<view class="setmima">
  4 + <view class="setmimaleft">
  5 + <input placeholder='设置密码' placeholder-class='shemi' bindinput="shezhimima" type="password"/>
  6 +
  7 + </view>
  8 + <view class="mimaeye">
  9 + <image src="{{url}}/bicon_14x.png"></image>
  10 + </view>
  11 +</view>
  12 +
  13 +<view class="que" bindtap="queding">确认</view>
  14 +
  15 +<view class="needmi">需要有6-20位数字、字母或符号组成，至少两种</view>
  16 +<!--
  17 +<view class="mimasuccess">密码设置成功</view> -->
  1 +page{
  2 + background: #F2F2F2
  3 +}
  4 +.setmima{
  5 + width:540rpx;
  6 + height:120rpx;
  7 + background:rgba(255,255,255,1);
  8 + border-radius:5rpx;
  9 + margin:74rpx auto 0;
  10 + display:flex;
  11 + align-items: center;
  12 + justify-content: space-between;
  13 + padding: 0 30rpx;
  14 + box-sizing: border-box
  15 +}
  16 +.setmimaleft{
  17 + width:420rpx;
  18 + color:#1A1A1A;
  19 + font-size: 30rpx;
  20 +
  21 +}
  22 +.shemi{
  23 + color:#1A1A1A;
  24 + font-size: 30rpx;
  25 +}
  26 +.mimaeye{
  27 + width:34rpx;
  28 + height:16rpx;
  29 + font-size: 0
  30 +}
  31 +.que{
  32 + width:540rpx;
  33 + height:100rpx;
  34 + background:rgba(232,24,37,1);
  35 + border-radius:50rpx;
  36 + color:#fff;
  37 + font-size: 30rpx;
  38 + text-align: center;
  39 + line-height: 100rpx;
  40 + margin:90rpx auto 0;
  41 +}
  42 +.needmi{
  43 + color:#999999;
  44 + font-size: 24rpx;
  45 + text-align: center;
  46 + margin-top:32rpx;
  47 +}
  48 +.mimasuccess{
  49 + width:290rpx;
  50 + height:60rpx;
  51 + background:rgba(0,0,0,1);
  52 + opacity:0.8;
  53 + border-radius:10rpx;
  54 + color:#fff;
  55 + font-size: 24rpx;
  56 + text-align: center;
  57 + line-height: 60rpx;
  58 + margin:468rpx auto 0;
  59 +}
  60 +.shemima{
  61 + color:#1A1A1A;
  62 + font-size: 28rpx;
  63 + font-weight: bold;
  64 + text-align: center;
  65 + margin-top: 106rpx;
  66 +
  67 +}
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 "list": [] 49 "list": []
50 }, 50 },
51 "miniprogram": { 51 "miniprogram": {
52 - "current": 40, 52 + "current": 43,
53 "list": [ 53 "list": [
54 { 54 {
55 "id": -1, 55 "id": -1,
@@ -305,36 +305,59 @@ @@ -305,36 +305,59 @@
305 }, 305 },
306 { 306 {
307 "id": -1, 307 "id": -1,
308 - "name": "每日新酒",  
309 - "pathName": "pages/findblock/meirixinjiu/meirixinjiu", 308 + "name": "历史",
  309 + "pathName": "pages/myblock/history/history",
310 "query": "", 310 "query": "",
311 "scene": null 311 "scene": null
312 }, 312 },
313 { 313 {
314 "id": -1, 314 "id": -1,
315 - "name": "名人酒单",  
316 - "pathName": "pages/findblock/jiulist/jiulist", 315 + "name": "个人中心收藏品牌",
  316 + "pathName": "pages/myblock/pinpai/pinpai",
  317 + "query": "",
  318 + "query": "",
  319 + "scene": null
  320 + },
  321 + {
  322 + "id": 38,
  323 + "name": "消息",
  324 + "pathName": "pages/myblock/message/message",
  325 + "query": "",
  326 + "scene": null
  327 + },
  328 + {
  329 + "id": 39,
  330 + "name": "用户反馈",
  331 + "pathName": "pages/myblock/feedback/feedback",
317 "query": "", 332 "query": "",
318 "scene": null 333 "scene": null
319 }, 334 },
320 { 335 {
321 "id": -1, 336 "id": -1,
322 - "name": "设置密码",  
323 - "pathName": "pages/setmima/setmima", 337 + "name": "账号绑定",
  338 + "pathName": "pages/myblock/zhanghaobangding/zhanghaobangding",
324 "query": "", 339 "query": "",
325 "scene": null 340 "scene": null
326 }, 341 },
327 { 342 {
328 "id": -1, 343 "id": -1,
329 - "name": "忘记密码",  
330 - "pathName": "pages/forgetmima/forgetmima", 344 + "name": "换绑手机",
  345 + "pathName": "pages/myblock/huanbangshouji/huanbangshouji",
331 "query": "", 346 "query": "",
332 "scene": null 347 "scene": null
333 }, 348 },
334 { 349 {
335 "id": -1, 350 "id": -1,
336 - "name": "用户信息",  
337 - "pathName": "pages/peopleinfo/peopleinfo", 351 + "name": "设置密码",
  352 + "pathName": "pages/myblock/shezhimima/shezhimima",
  353 + "query": "",
  354 + "scene": null
  355 + },
  356 + {
  357 + "id": -1,
  358 + "name": "协议规则",
  359 + "pathName": "pages/myblock/rule/rule",
  360 + "query": "",
338 "scene": null 361 "scene": null
339 } 362 }
340 ] 363 ]