燕成杰 / Bitcoin · 提交

转到一个项目

作者 燕成杰
提交 9c50d088c5c0c784f39fafcd24e94866f232cb1f 2 个父辈 69c653bb 42469067

合并分支 'yan' 到 'master' 

修改样式及bug



查看合并请求 !17
内嵌 并排对比
正在显示 11 个修改的文件 包含 115 行增加 和 21 行删除
1 { 1 {
2 "name" : "Bitcoin", 2 "name" : "Bitcoin",
3 - "appid" : "__UNI__D7F2A57", 3 + "appid" : "__UNI__D80DC8B",
4 "description" : "", 4 "description" : "",
5 "versionName" : "1.0.0", 5 "versionName" : "1.0.0",
6 "versionCode" : "100", 6 "versionCode" : "100",
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 <image src="../../static/heart.png" mode="" v-if="detail.is_fav==0" @click="product_favorite"> 13 <image src="../../static/heart.png" mode="" v-if="detail.is_fav==0" @click="product_favorite">
14 </image> 14 </image>
15 <image src="../../static/1.png" mode="" v-else @click="product_favorite"></image> 15 <image src="../../static/1.png" mode="" v-else @click="product_favorite"></image>
16 - <image src="../../static/share.png" mode=""></image> 16 + <image src="../../static/share.png" @click="shareModel=true" mode=""></image>
17 <image src="../../static/result.png" mode="" @click="show = true"></image> 17 <image src="../../static/result.png" mode="" @click="show = true"></image>
18 </view> 18 </view>
19 </view> 19 </view>
@@ -125,12 +125,18 @@ @@ -125,12 +125,18 @@
125 </scroll-view> 125 </scroll-view>
126 </view> 126 </view>
127 </view> 127 </view>
128 - </u-popup> 128 + </u-popup>
  129 + <view class="share" v-if="shareModel" @click="shareModel=false">
  130 + <image src="../../static/detailShare.png" mode=""></image>
  131 + <view class="">
  132 + 点击这里进行分享
  133 + </view>
  134 + </view>
129 </view> 135 </view>
130 </template> 136 </template>
131 137
132 -<script>  
133 - let jweixin = require('jweixin-module') 138 +<script>
  139 + var jweixin = require('jweixin-module');
134 import { 140 import {
135 product_detail, 141 product_detail,
136 product_favorite, 142 product_favorite,
@@ -171,16 +177,78 @@ @@ -171,16 +177,78 @@
171 isshow: false, 177 isshow: false,
172 isshowname: "请选择", 178 isshowname: "请选择",
173 isid: "", 179 isid: "",
174 - content: "", 180 + content: "",
  181 + shareModel:false
175 } 182 }
  183 + },
  184 + onShow() {
  185 +
176 }, 186 },
177 onLoad(options) { 187 onLoad(options) {
178 this.id = options.id 188 this.id = options.id
179 this.product_detail() 189 this.product_detail()
180 this.report_list() 190 this.report_list()
181 -  
182 }, 191 },
183 - methods: { 192 + methods: {
  193 + share(){
  194 + let that = this;
  195 + jweixin.ready(function() {
  196 + //分享给朋友
  197 + jweixin.onMenuShareAppMessage({
  198 + title: that.detail.name, // 分享标题
  199 + link: window.location.href, // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
  200 + imgUrl: that.detail.images_preview[0], // 分享图标
  201 + success: function() {
  202 + // 用户点击了分享后执行的回调函数
  203 + uni.showToast({
  204 + title: '分享成功',
  205 + duration: 2000
  206 + });
  207 + },
  208 + cancel: function(res) {
  209 + console.log('取消分享')
  210 + }
  211 + });
  212 + jweixin.updateAppMessageShareData({
  213 + title: that.detail.name, // 分享标题
  214 + link: window.location.href, // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
  215 + imgUrl: that.detail.images_preview[0], // 分享图标
  216 + success: function() {
  217 + console.log('设置分享给朋友成功')
  218 + },
  219 + cancel: function(res) {
  220 + console.log('取消分享')
  221 + }
  222 + });
  223 + //分享到朋友圈
  224 + jweixin.onMenuShareTimeline({
  225 + title: that.detail.name, // 分享标题
  226 + link: window.location.href, // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
  227 + imgUrl: that.detail.images_preview[0], // 分享图标
  228 + success: function() {
  229 + // 用户点击了分享后执行的回调函数
  230 + uni.showToast({
  231 + title: '分享成功',
  232 + duration: 2000
  233 + });
  234 + },
  235 + cancel: function(res) {
  236 + console.log('取消分享')
  237 + }
  238 + });
  239 + jweixin.updateTimelineShareData({
  240 + title: that.detail.name, // 分享标题
  241 + link: window.location.href, // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
  242 + imgUrl: that.detail.images_preview[0], // 分享图标
  243 + success: function() {
  244 + console.log('设置分享到朋友圈成功')
  245 + },
  246 + cancel: function(res) {
  247 + console.log('取消分享')
  248 + }
  249 + });
  250 + });
  251 + },
184 showbox() { 252 showbox() {
185 this.isshow = !this.isshow 253 this.isshow = !this.isshow
186 }, 254 },
@@ -259,7 +327,8 @@ @@ -259,7 +327,8 @@
259 const res = await product_detail(this.id) 327 const res = await product_detail(this.id)
260 console.log('product_detail', res) 328 console.log('product_detail', res)
261 this.detail = res.detail 329 this.detail = res.detail
262 - this.list1 = res.detail.images_preview 330 + this.list1 = res.detail.images_preview
  331 + this.share()
263 // 保存数据 332 // 保存数据
264 } catch (err) { 333 } catch (err) {
265 uni.showToast({ 334 uni.showToast({
@@ -578,5 +647,28 @@ @@ -578,5 +647,28 @@
578 } 647 }
579 } 648 }
580 } 649 }
  650 + }
  651 + .share {
  652 + position: fixed;
  653 + left: 0;
  654 + top: 0;
  655 + width: 100%;
  656 + height: 100%;
  657 + background: rgba(0,0,0,.6);
  658 + image {
  659 + position: fixed;
  660 + right: 80rpx;
  661 + top: 4rpx;
  662 + width: 188rpx;
  663 + height: 262rpx;
  664 + }
  665 + view {
  666 + position: fixed;
  667 + right: 80rpx;
  668 + top: 300rpx;
  669 + color: rgba(255,255,255,1);
  670 + font-size: 36rpx;
  671 + font-weight: 700;
  672 + }
581 } 673 }
582 </style> 674 </style>
@@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@
80 </view> 80 </view>
81 </view> 81 </view>
82 </view> 82 </view>
83 - <view class="misslist"> 83 + <view class="misslist" v-if="list.length">
84 <custom-waterfalls-flow :value="list" @wapperClick="godetail" @imageClick="godetail"> 84 <custom-waterfalls-flow :value="list" @wapperClick="godetail" @imageClick="godetail">
85 <template v-slot:default="item"> 85 <template v-slot:default="item">
86 <view class="item"> 86 <view class="item">
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 </view> 11 </view>
12 </view> 12 </view>
13 </view> 13 </view>
14 - <u-empty marginTop ="200" mode="data" v-if="!list.length"></u-empty> 14 + <u-empty marginTop ="200" text="暂无数据" mode="data" v-if="!list.length"></u-empty>
15 <scroll-view v-if="list.length" scroll-y="true" @scrolltolower="scrolltolower" style="height: 100vh"> 15 <scroll-view v-if="list.length" scroll-y="true" @scrolltolower="scrolltolower" style="height: 100vh">
16 <view class="misslist"> 16 <view class="misslist">
17 <custom-waterfalls-flow :value="list" @wapperClick="godetail" @imageClick="godetail"> 17 <custom-waterfalls-flow :value="list" @wapperClick="godetail" @imageClick="godetail">
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 <view class="beforename"> 14 <view class="beforename">
15 身份证号： 15 身份证号：
16 </view> 16 </view>
17 - <input type="number" v-model="text" maxlength="18" placeholder="请输入"> 17 + <input type="text" v-model="number" maxlength="18" placeholder="请输入">
18 </view> 18 </view>
19 <view class="imgbar"> 19 <view class="imgbar">
20 <view class="mytitle">身份证照片 </view> 20 <view class="mytitle">身份证照片 </view>
@@ -219,8 +219,13 @@ @@ -219,8 +219,13 @@
219 } 219 }
220 } 220 }
221 221
222 - .user {  
223 - margin-top: 200rpx; 222 + .user {
  223 + position: absolute;
  224 + width: 100%;
  225 + left: 50%;
  226 + bottom: 16rpx;
  227 + transform: translateX(-50%);
  228 + // margin-top: 200rpx;
224 text-align: center; 229 text-align: center;
225 display: flex; 230 display: flex;
226 align-items: center; 231 align-items: center;
@@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
55 <view class="popTitle"> 55 <view class="popTitle">
56 转赠证明 56 转赠证明
57 </view> 57 </view>
58 - <image class="popImage" :src="showimg" mode="scaleToFill"></image> 58 + <image class="popImage" :src="showimg" mode="aspectFit"></image>
59 <view class="popBtn flexA"> 59 <view class="popBtn flexA">
60 <view class="btn flexC" v-if="reChest(showstatus)" @click="order_confirm(showid,showindex,2)">未收货 60 <view class="btn flexC" v-if="reChest(showstatus)" @click="order_confirm(showid,showindex,2)">未收货
61 </view> 61 </view>
@@ -263,6 +263,7 @@ @@ -263,6 +263,7 @@
263 263
264 .mainBox { 264 .mainBox {
265 position: absolute; 265 position: absolute;
  266 + width: 100%;
266 left: 0; 267 left: 0;
267 top: 0; 268 top: 0;
268 padding: 28rpx 32rpx; 269 padding: 28rpx 32rpx;
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
56 <view class="popTitle"> 56 <view class="popTitle">
57 转赠证明 57 转赠证明
58 </view> 58 </view>
59 - <image class="popImage" :src="licenimg" mode="scaleToFill"></image> 59 + <image class="popImage" :src="licenimg" mode="aspectFit"></image>
60 <view class="popBtn flexC"> 60 <view class="popBtn flexC">
61 <view class="btn flexC" @click="show=false">确定</view> 61 <view class="btn flexC" @click="show=false">确定</view>
62 </view> 62 </view>
1 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>元届印象</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)')) 1 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>元届印象</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
2 -<<<<<<< HEAD  
3 - document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.ba77b176.js></script><script src=/static/js/index.100fbe17.js></script></body></html>  
4 -=======  
5 - document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.f3bf79df.js></script><script src=/static/js/index.c5ea6188.js></script></body></html>  
6 ->>>>>>> 3474d13fb5309675e2ea7f364b5e3a892b8efe5a 2 + document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.f3bf79df.js></script><script src=/static/js/index.bdc7f535.js></script></body></html>