chen
/
hengmei-two
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: chen:bab849a14eb5b152c5633b0804faa74a65cb7c76
Branches Tags
chen:master
..
compare: chen:0b5c8a21e73c4ebcc775ec7fbf3524b47fc93a5f
Branches Tags
chen:master

No commits in common. "bab849a14eb5b152c5633b0804faa74a65cb7c76" and "0b5c8a21e73c4ebcc775ec7fbf3524b47fc93a5f" have entirely different histories.
bab849a14e ... 0b5c8a21e7

33 changed files with 30 additions and 206 deletions
Show Stats Expand all files Collapse all files

8
pagesA/activityTask/activityTask.vue
View File

@ -69,19 +69,11 @@
</view>
<!-- 用户信息授权，手机号授权 -->
<auth-userInfo-mobileInfo></auth-userInfo-mobileInfo>
<!-- 底部导航 -->
<view class="posixzy">
<bottom-tab></bottom-tab>
</view>
</view>
</template>
<script>
import bottomTab from '@/components/bottom-tab.vue';
export default {
components: {
bottomTab,
},
data() {
return {
isScreenshot:false,

8
pagesA/coupon/coupon.vue
View File

@ -46,20 +46,14 @@
</view>
<!-- 用户信息授权，手机号授权 -->
<auth-userInfo-mobileInfo></auth-userInfo-mobileInfo>
<!-- 底部导航 -->
<view class="posixzy">
<bottom-tab></bottom-tab>
</view>
</view>
</template>
<script>
import yzQr from '@/components/yz-qr/yz-qr.vue';
import bottomTab from '@/components/bottom-tab.vue';
export default {
components:{
yzQr,
bottomTab,
yzQr
},
data() {
return {

10
pagesA/makeAnPppointment/makeAnPppointment.vue
View File

@ -30,7 +30,7 @@
<nothing-page v-if="dataList.length==0" :content="'暂无更多预约内容'"></nothing-page>
</view>
<!-- 底部按钮 -->
<view class="posixzy bacf pad-sx25" style="bottom: 180rpx; background: none;">
<view class="posixzy bacf pad-sx25">
<view @tap="goYu" class="fon30 radius20 tc colf bold" style="margin: 0 83rpx;height: 90rpx;line-height: 90rpx;" :style="{background:publicColor}">我要预约</view>
</view>
<!-- 弹框 -->
@ -39,19 +39,11 @@
<public-customer></public-customer>
<!-- 用户信息授权，手机号授权 -->
<auth-userInfo-mobileInfo></auth-userInfo-mobileInfo>
<!-- 底部导航 -->
<view class="posixzy">
<bottom-tab></bottom-tab>
</view>
</view>
</template>
<script>
import bottomTab from '@/components/bottom-tab.vue';
export default {
components: {
bottomTab,
},
data() {
return {
failColor:'#CCCCCC',//失败背景颜色

8
pagesA/member/member.vue
View File

@ -45,20 +45,14 @@
<scoreList :dataList="dataList"></scoreList>
<!-- 用户信息授权，手机号授权 -->
<auth-userInfo-mobileInfo></auth-userInfo-mobileInfo>
<!-- 底部导航 -->
<view class="posixzy">
<bottom-tab></bottom-tab>
</view>
</view>
</template>
<script>
import scoreList from '@/components/score-list.vue';
import bottomTab from '@/components/bottom-tab.vue';
export default {
components:{
scoreList,
bottomTab,
scoreList
},
data() {
return {

8
pagesA/my-diary/my-diary.vue
View File

@ -28,21 +28,13 @@
<public-customer></public-customer>
<!-- 用户信息授权，手机号授权 -->
<auth-userInfo-mobileInfo></auth-userInfo-mobileInfo>
<!-- 底部导航 -->
<view class="posixzy">
<bottom-tab></bottom-tab>
</view>
</view>
</template>
<script>
import {base64ToPath} from '@/jsFile/base64-src.js';
import {checkBanner} from '@/jsFile/publicAPI.js';
import bottomTab from '@/components/bottom-tab.vue';
export default {
components: {
bottomTab,
},
data() {
return {
optionObj:'',

10
pagesA/myAddress/myAddress.vue
View File

@ -22,7 +22,7 @@
</view>
</view>
</view>
<view @tap.stop="obtainLngLat" class="posixzy address_add" style="bottom: 180rpx;">添加地址</view>
<view @tap.stop="obtainLngLat" class="posixzy address_add" style="bottom: 20rpx;">添加地址</view>
<view style="margin-top: 50%;">
<nothing-page v-if="dataList.length==0" :content="'暂无可用地址'"></nothing-page>
</view>
@ -86,20 +86,12 @@
</view>
</view>
</view>
<!-- 底部导航 -->
<view class="posixzy">
<bottom-tab></bottom-tab>
</view>
</view>
</template>
<script>
import {lotusAddressJson} from '@/components/city/city.js';
import bottomTab from '@/components/bottom-tab.vue';
export default {
components: {
bottomTab,
},
data() {
return {
dataList:[],

8
pagesA/signIn/signIn.vue
View File

@ -45,19 +45,11 @@
</view>
<!-- 用户信息授权，手机号授权 -->
<auth-userInfo-mobileInfo></auth-userInfo-mobileInfo>
<!-- 底部导航 -->
<view class="posixzy">
<bottom-tab></bottom-tab>
</view>
</view>
</template>
<script>
import bottomTab from '@/components/bottom-tab.vue';
export default {
components: {
bottomTab,
},
data() {
return {
timeList:[],

38
pagesB/articleDetail/articleDetail.vue
View File

@ -40,10 +40,6 @@
<view class="fon24 col3">暂无内容</view>
</view>
</view>
<!-- 分享 -->
<view @tap="shareImgEv" class="detail-cart-box" style="display: flex;justify-content: center;align-items: center;width: 112rpx;height: 112rpx;border-radius: 100%;background-color: #0fac29;bottom: 160rpx;color: #FFFFFF;">
<image class="zanw-img" src="/static/public/share-pyq.png" mode="aspectFill" style="width: 64rpx;height: 81rpx;"></image>
</view>
<view class="posixzy disjbac bacf pad-zy32 btnBKS">
<view class="posir">
<image @tap="backHome" class="posia backH" src="/static/public/back-home.png" mode="aspectFill"></image>
@ -67,7 +63,6 @@
</template>
<script>
import { base64ToPath } from '@/jsFile/base64-src.js';
export default {
data() {
return {
@ -89,7 +84,6 @@
total:'',//总数
isZanw:true,
// shareImg:''//分享图
shareFlag:true,
}
},
computed: {
@ -134,38 +128,6 @@
}
},
methods: {
// 分享图分享
shareImgEv(){
this.$toolAll.tools.showToast('分享图生成中...','none',10000);
if(this.shareFlag){
this.shareFlag = false;
this.$requst.post('archives/share',{id:this.detailId}).then(res=>{
base64ToPath(res.data.share_img).then(path=>{
uni.hideToast();
this.$toolAll.tools.showToast('正在调起分享...');
wx.showShareImageMenu({
path: path,
success:(res=>{
this.shareFlag = true;
this.$requst.post('user/record', {
type: 'content',
action: 'share',
id: this.detailId
}).then(res => {
console.log('分享成功：', res);
}, error => {})
// 调用tools.js中的种植埋点事件
this.$toolAll.tools.plantPoint(4);
}),
fail:(err=>{
this.shareFlag = true;
})
})
})
})
} else {this.$toolAll.tools.showToast('请勿重复点击');}
},
checkAbout(category_id){
let params = {
category_id:category_id,

8
pagesB/couponGroup/couponGroup.vue
View File

@ -38,19 +38,11 @@
</view>
<!-- 用户信息授权，手机号授权 -->
<auth-userInfo-mobileInfo></auth-userInfo-mobileInfo>
<!-- 底部导航 -->
<view class="posixzy">
<bottom-tab></bottom-tab>
</view>
</view>
</template>
<script>
import bottomTab from '@/components/bottom-tab.vue';
export default {
components: {
bottomTab,
},
data() {
return {
dataList:[],

10
pagesB/messagecenter/messagecenter.vue
View File

@ -30,20 +30,12 @@
<!-- 返回顶部 -->
<!-- <back-top :showTop="showTop" @backTop="backTop"></back-top> -->
<!-- 底部客服 -->
<public-customer :nbottom="180"></public-customer>
<!-- 底部导航 -->
<view class="posixzy">
<bottom-tab></bottom-tab>
</view>
<public-customer :nbottom="100"></public-customer>
</view>
</template>
<script>
import bottomTab from '@/components/bottom-tab.vue';
export default {
components: {
bottomTab,
},
data() {
return {
searchVal:'',//输入框的值

10
pagesB/myCollection/myCollection.vue
View File

@ -121,22 +121,16 @@
<!-- 返回顶部 -->
<!-- <back-top :showTop="showTop" @backTop="backTop"></back-top> -->
<!-- 底部客服 -->
<public-customer :nbottom="180"></public-customer>
<!-- 底部导航 -->
<view class="posixzy">
<bottom-tab></bottom-tab>
</view>
<public-customer :nbottom="100"></public-customer>
</view>
</template>
<script>
import {cancleCollectionEV,cancleCollectionShopEV} from '@/jsFile/publicAPI.js';
import shopList from '@/components/shop-list.vue';
import bottomTab from '@/components/bottom-tab.vue';
export default {
components:{
shopList,
bottomTab,
shopList
},
data() {
return {

4
pagesB/problemDetail/problemDetail.vue
View File

@ -92,8 +92,8 @@
</view>
</view>
<!-- 分享 -->
<view @tap="shareImgEv" class="detail-cart-box" style="display: flex;justify-content: center;align-items: center;width: 112rpx;height: 112rpx;border-radius: 100%;background-color: #0fac29;bottom: 160rpx;color: #FFFFFF;">
<image class="zanw-img" src="/static/public/share-pyq.png" mode="aspectFill" style="width: 64rpx;height: 81rpx;"></image>
<view @tap="shareImgEv" class="detail-cart-box" style="display: flex;justify-content: center;align-items: center;width: 112rpx;height: 112rpx;border-radius: 100%;background-color: rgba(0,0,0,.5);bottom: 160rpx;color: #FFFFFF;">
分享
</view>
<!-- 返回顶部 -->
<!-- <back-top :showTop="showTop" @backTop="backTop"></back-top> -->

4
pagesB/shopDetail/shopDetail.vue
View File

@ -182,8 +182,8 @@
</view>
</view>
<!-- 分享 -->
<view @tap="shareImgEv" class="detail-cart-box" style="display: flex;justify-content: center;align-items: center;width: 112rpx;height: 112rpx;border-radius: 100%;background-color: #0fac29;bottom: 436rpx;color: #FFFFFF;">
<image class="zanw-img" src="/static/public/share-pyq.png" mode="aspectFill" style="width: 64rpx;height: 81rpx;"></image>
<view @tap="shareImgEv" class="detail-cart-box" style="display: flex;justify-content: center;align-items: center;width: 112rpx;height: 112rpx;border-radius: 100%;background-color: rgba(0,0,0,.5);bottom: 436rpx;color: #FFFFFF;">
分享
</view>
<!-- 购物车 -->
<view @tap="goShopCart" class="detail-cart-box">

BIN
static/public/share-pyq.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.5 KiB

2
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
unpackage/dist/dev/.sourcemap/mp-weixin/components/backTop.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
unpackage/dist/dev/.sourcemap/mp-weixin/components/cate-items/cate-pu.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
unpackage/dist/dev/.sourcemap/mp-weixin/components/foot-tab.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
unpackage/dist/dev/.sourcemap/mp-weixin/components/list-pu.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
unpackage/dist/dev/.sourcemap/mp-weixin/components/nothing-page.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
unpackage/dist/dev/.sourcemap/mp-weixin/components/public-customer.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
unpackage/dist/dev/.sourcemap/mp-weixin/components/simple-address/simple-address.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
unpackage/dist/dev/.sourcemap/mp-weixin/components/status-nav.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
unpackage/dist/dev/.sourcemap/mp-weixin/components/swiper-pu.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
unpackage/dist/dev/.sourcemap/mp-weixin/pages/tabbar/shop/shop.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/makeAnPppointment/makeAnPppointment.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/nodifyData/nodifyData.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/articleDetail/articleDetail.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/messagecenter/messagecenter.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/myCollection/myCollection.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/video/playVideo.js.map vendored
View File

File diff suppressed because one or more lines are too long