Skip to content

W
weiit-saas-mall-miniapp-dms-init
Commit 9b99027a by MYzhangweihao
Options

ad

parent 4ed0db44
Showing with 179 additions and 94 deletions
components/file-footerlogo.vue
......@@ -2,7 +2,6 @@
<view class="tikcos_logo_box">
<view class="d-flex just-content-center align-items-center">
<view class="tikcos_name">Weiit提供技术支持</view>
<!-- <view class="tikcos_name">sky企得力提供技术支持</view> -->
</view>
</view>
</template>
......
components/shop-decorater/com/uni-notice-bar.vue
<template>
<view v-if="show" class="uni-noticebar" :style="{ backgroundColor: backgroundColor }" @click="onClick">
<!-- #ifdef MP-ALIPAY -->
<view v-if="showClose === true || showClose === 'true'" class="uni-noticebar-close uni-cursor-point" @click="close">
<view v-if="showClose === true || showClose === 'true'" class="uni-noticebar-close uni-cursor-point"
@click="close">
<uni-icons type="closeempty" :color="color" size="12" />
</view>
<view v-if="showIcon === true || showIcon === 'true'" class="uni-noticebar-icon"><uni-icons type="sound" :color="color" size="14" /></view>
<view v-if="showIcon === true || showIcon === 'true'" class="uni-noticebar-icon"><uni-icons type="sound"
:color="color" size="14" /></view>
<!-- #endif -->
<!-- #ifndef MP-ALIPAY -->
<uni-icons v-if="showClose === true || showClose === 'true'" class="uni-noticebar-close uni-cursor-point" type="closeempty" :color="color" size="12" @click="close" />
<uni-icons v-if="showIcon === true || showIcon === 'true'" class="uni-noticebar-icon" type="sound" :color="color" size="14" />
<uni-icons v-if="showClose === true || showClose === 'true'" class="uni-noticebar-close uni-cursor-point"
type="closeempty" :color="color" size="12" @click="close" />
<uni-icons v-if="showIcon === true || showIcon === 'true'" class="uni-noticebar-icon" type="sound"
:color="color" size="14" />
<!-- #endif -->
<view
ref="textBox"
class="uni-noticebar__content-wrapper"
:class="{ 'uni-noticebar__content-wrapper--scrollable': scrollable, 'uni-noticebar__content-wrapper--single': !scrollable && (single || moreText) }"
>
<view
:id="elIdBox"
class="uni-noticebar__content"
:class="{ 'uni-noticebar__content--scrollable': scrollable, 'uni-noticebar__content--single': !scrollable && (single || moreText) }"
>
<text
:id="elId"
ref="animationEle"
class="uni-noticebar__content-text"
<view ref="textBox" class="uni-noticebar__content-wrapper" :style="{backgroundColor: backgroundColor,}"
:class="{ 'uni-noticebar__content-wrapper--scrollable': scrollable, 'uni-noticebar__content-wrapper--single': !scrollable && (single || moreText) }">
<view :id="elIdBox" class="uni-noticebar__content"
:class="{ 'uni-noticebar__content--scrollable': scrollable, 'uni-noticebar__content--single': !scrollable && (single || moreText) }">
<text :id="elId" ref="animationEle" class="uni-noticebar__content-text"
:class="{ 'uni-noticebar__content-text--scrollable': scrollable, 'uni-noticebar__content-text--single': !scrollable && (single || moreText) }"
:style="{
color: color,
width: wrapWidth + 'px',
backgroundColor: backgroundColor,
animationDuration: animationDuration,
'-webkit-animationDuration': animationDuration,
animationPlayState: webviewHide ? 'paused' : animationPlayState,
'-webkit-animationPlayState': webviewHide ? 'paused' : animationPlayState,
animationDelay: animationDelay,
'-webkit-animationDelay': animationDelay
}"
>
}">
{{ text }}
</text>
</view>
</view>
<view v-if="showGetMore === true || showGetMore === 'true'" class="uni-noticebar__more uni-cursor-point" @click="clickMore">
<view v-if="showGetMore === true || showGetMore === 'true'" class="uni-noticebar__more uni-cursor-point"
@click="clickMore">
<text v-if="moreText" :style="{ color: moreColor }" class="uni-noticebar__more-text">{{ moreText }}</text>
<uni-icons type="arrowright" :color="moreColor" size="14" />
</view>
......@@ -48,12 +44,12 @@
</template>
<script>
// #ifdef APP-NVUE
const dom = weex.requireModule('dom');
const animation = weex.requireModule('animation');
// #endif
// #ifdef APP-NVUE
const dom = weex.requireModule('dom');
const animation = weex.requireModule('animation');
// #endif
/**
/**
* NoticeBar 自定义导航栏
* @description 通告栏组件
* @tutorial https://ext.dcloud.net.cn/plugin?id=30
......@@ -73,7 +69,7 @@ const animation = weex.requireModule('animation');
* @event {Function} getmore 点击”查看更多“时触发事件
*/
export default {
export default {
name: 'UniNoticeBar',
props: {
text: {
......@@ -213,8 +209,7 @@ export default {
let winWidth = uni.getSystemInfoSync().windowWidth;
this.textWidth = res.size.width;
animation.transition(
this.$refs['animationEle'],
{
this.$refs['animationEle'], {
styles: {
transform: `translateX(-${winWidth}px)`
},
......@@ -225,8 +220,7 @@ export default {
() => {
if (!this.stopAnimation) {
animation.transition(
this.$refs['animationEle'],
{
this.$refs['animationEle'], {
styles: {
transform: `translateX(-${this.textWidth}px)`
},
......@@ -257,8 +251,7 @@ export default {
loopAnimation() {
// #ifdef APP-NVUE
animation.transition(
this.$refs['animationEle'],
{
this.$refs['animationEle'], {
styles: {
transform: `translateX(0px)`
},
......@@ -267,8 +260,7 @@ export default {
() => {
if (!this.stopAnimation) {
animation.transition(
this.$refs['animationEle'],
{
this.$refs['animationEle'], {
styles: {
transform: `translateX(-${this.textWidth}px)`
},
......@@ -298,11 +290,11 @@ export default {
this.$emit('click');
}
}
};
};
</script>
<style scoped>
.uni-noticebar {
.uni-noticebar {
/* #ifndef APP-NVUE */
display: flex;
width: 100%;
......@@ -312,48 +304,48 @@ export default {
align-items: center;
padding: 6rpx 12rpx;
margin-bottom: 10px;
}
}
.uni-cursor-point {
.uni-cursor-point {
/* #ifdef H5 */
cursor: pointer;
/* #endif */
}
}
.uni-noticebar-close {
.uni-noticebar-close {
margin-right: 5px;
}
}
.uni-noticebar-icon {
.uni-noticebar-icon {
margin-right: 5px;
}
}
.uni-noticebar__content-wrapper {
.uni-noticebar__content-wrapper {
flex: 1;
flex-direction: column;
overflow: hidden;
}
}
.uni-noticebar__content-wrapper--single {
.uni-noticebar__content-wrapper--single {
/* #ifndef APP-NVUE */
line-height: 18px;
/* #endif */
}
}
.uni-noticebar__content-wrapper--single,
.uni-noticebar__content-wrapper--scrollable {
.uni-noticebar__content-wrapper--single,
.uni-noticebar__content-wrapper--scrollable {
flex-direction: row;
}
}
/* #ifndef APP-NVUE */
.uni-noticebar__content-wrapper--scrollable {
/* #ifndef APP-NVUE */
.uni-noticebar__content-wrapper--scrollable {
position: relative;
height: 36rpx;
line-height: 36rpx;
}
}
/* #endif */
.uni-noticebar__content--scrollable {
/* #endif */
.uni-noticebar__content--scrollable {
/* #ifdef APP-NVUE */
flex: 0;
/* #endif */
......@@ -362,26 +354,26 @@ export default {
display: block;
overflow: hidden;
/* #endif */
}
}
.uni-noticebar__content--single {
.uni-noticebar__content--single {
/* #ifndef APP-NVUE */
display: flex;
flex: none;
width: 100%;
justify-content: center;
/* #endif */
}
}
.uni-noticebar__content-text {
.uni-noticebar__content-text {
font-size: 24rpx;
line-height: 36rpx;
/* #ifndef APP-NVUE */
word-break: break-all;
/* #endif */
}
}
.uni-noticebar__content-text--single {
.uni-noticebar__content-text--single {
/* #ifdef APP-NVUE */
lines: 1;
/* #endif */
......@@ -392,9 +384,9 @@ export default {
/* #endif */
overflow: hidden;
text-overflow: ellipsis;
}
}
.uni-noticebar__content-text--scrollable {
.uni-noticebar__content-text--scrollable {
/* #ifdef APP-NVUE */
lines: 1;
padding-left: 750rpx;
......@@ -409,9 +401,9 @@ export default {
animation: notice 10s 0s linear infinite both;
animation-play-state: paused;
/* #endif */
}
}
.uni-noticebar__more {
.uni-noticebar__more {
/* #ifndef APP-NVUE */
display: inline-flex;
/* #endif */
......@@ -419,15 +411,15 @@ export default {
flex-wrap: nowrap;
align-items: center;
padding-left: 5px;
}
}
.uni-noticebar__more-text {
.uni-noticebar__more-text {
font-size: 14px;
}
}
@keyframes notice {
@keyframes notice {
100% {
transform: translate3d(-100%, 0, 0);
}
}
}
</style>
\ No newline at end of file
config/index.js
......@@ -11,16 +11,16 @@ const envConfigs = {
imgUrl: "https://cdn.tikcos.cn/saas/mall/img/",
},
};
const appConfigs = {
wx727893371335676b: {
appCode: "TC20",
tenantId: 'weiit6402646395122f993b96db77e42b0e3a29ea1e3e527d1',
shopId: "0000",
appId: "wx727893371335676b",
appName: "51春水阁",
appName: "51悦享阁",
baseUrl: "https://api.wei-it.com",
contactInfo: {
//QYKF企业客服，WXKF微信客服
contactType: 'WXKF',
contactExtUrl: 'https://work.weixin.qq.com/kfid/kfc3fdcb835c0f701bc',
contactCorpId: 'ww6aaa281b3cd5de13'
......@@ -291,4 +291,5 @@ const appConfigs = {
},
};
let config = Object.assign({}, envConfigs[env], appConfigs[appId]);
console.log(config)
export default config;
\ No newline at end of file
mixin/UploadMixin.js
......@@ -24,11 +24,11 @@ const uploadMixin = {
uploadObj[i] = message;
if (!success) {
uploadObj[i] = '';
uni.showToast({
title: `[${i+1}]上传失败，请重新上传！`,
icon: 'none',
duration: 2000
});
// uni.showToast({
// title: `[${i+1}]上传失败，请重新上传！`,
// icon: 'none',
// duration: 2000
// });
}
if (uploadNum == 0) {
const arr = Array.from(uploadObj);
......
mixin/shareAppMessageMixin.js
......@@ -21,8 +21,6 @@ const shareMixin = {
? this.shareTitle
: `欢迎进入${this.$config.appName}`;
if (typeof this.onShare == "function") this.onShare();
;
console.log(pathUrl)
return {
title: title, // 转发后 所显示的title
path: pathUrl, // 相对的路径
......@@ -31,7 +29,7 @@ const shareMixin = {
},
methods: {
...mapActions(["getSceneInfo"]),
...mapMutations(["SET_SALES_MANNID"]),
...mapMutations(["SET_SALES_MANNID","SET_PARENTID"]),
async getQuery(callback) {
console.log(this.$mp)
let query = {};
......@@ -47,8 +45,10 @@ const shareMixin = {
console.log(query,'query')
let { salesManId } = query;
if (!!salesManId) {
this.SET_PARENTID(salesManId)
this.SET_SALES_MANNID(salesManId);
this.clickDMSUrl(salesManId);
}
}
......
subPackages/login/wxlogin.vue
<template>
<view class="container" :style="globelColor.primaryColor">
<!-- Mini-program info display -->
<view class="mini-program-info">
<view class="logo-box">
<image class="logo" :src="miniProgramLogo"></image>
</view>
<view class="app-name">{{miniProgramName}}</view>
</view>
<!-- <view class="title">基本信息</view> -->
<view class="info-box">
<view class="info-name-box">
......@@ -26,11 +34,6 @@
</view>
</view>
</view>
<view>
<button class="save" lang="zh_CN" open-type="getPhoneNumber" @getphonenumber="handlergetPhoneNumber">
手机号授权并登陆
</button>
</view>
<view class="infor">
<checkbox-group @change="changeChecked">
<checkbox :checked="checked" value="1" style="transform:scale(0.7)" />
......@@ -42,6 +45,13 @@
<a href="javascript:;" @click="goStoreAgreement('YFFW')">《会员协议》</a>
<a href="javascript:;" @click="goStoreAgreement('YSXY')">《隐私协议》</a>
</view>
<view>
<button class="save" lang="zh_CN" open-type="getPhoneNumber" @click="handleClick"
@getphonenumber="handlergetPhoneNumber">
手机号授权并登陆
</button>
</view>
</view>
</template>
<script>
......@@ -59,6 +69,8 @@
import {
uploadMixin
} from '@/mixin/UploadMixin.js'
import config from '@/config/index.js'
export default {
mixins: [uploadMixin],
data() {
......@@ -80,6 +92,13 @@
computed: {
...mapGetters(["isLogin", "memberId"]),
...mapState(["userinfo", "member", "globelColor", "salesManId"]),
miniProgramName() {
return __wxConfig.accountInfo.nickname ;
},
miniProgramLogo() {
// Using a default logo image, can be replaced with actual logo path
return __wxConfig.accountInfo.icon;
}
},
methods: {
...mapMutations(["SET_MEMBER", "SET_USER_INFO", "SET_PHONE_NUMBER", ]),
......@@ -89,13 +108,23 @@
"getSessionKeyByCode",
"getWxLogin"
]),
handleClick() {
if (!this.checkedList.includes('1')) {
return uni.showToast({
title: '请勾选并阅读隐私协议!',
duration: 2000,
icon: 'none'
})
}
},
async clickDMSUrl(salesManId) {
// if (!this.memberId) return;
let data = {
salesManId: salesManId,
userId: this.memberId,
};
console.log(data, 'data')
let {
success,
result
......@@ -105,7 +134,7 @@
this.checkedList = e.detail.value;
},
goStoreAgreement(sence) {
console.log(sence,'sence')
uni.navigateTo({
url: `/subPackages/StoreAgreement/StoreAgreement?sence=${sence}`
});
......@@ -223,7 +252,7 @@
<style lang="scss" scoped>
.container {
background: #f1f1f1;
background: #fff;
.title {
height: 79rpx;
......@@ -237,9 +266,9 @@
justify-content: center;
font-size: 28rpx;
color: #999;
display: flex;
margin-top: 20rpx;
align-items: center;
display: inline-flex;
margin: 28rpx 0 28rpx 28rpx;
}
.infor a {
......@@ -296,6 +325,7 @@
.label {
width: 100rpx;
color: #000;
font-size: 28rpx;
text-align: center;
margin-right: 100rpx;
}
......@@ -337,5 +367,37 @@
border-radius: 10rpx;
background-color: var(--primaryColor);
}
/* Mini-program info styles */
.mini-program-info {
display: flex;
flex-direction: column;
align-items: center;
padding: 30rpx 0;
margin-bottom: 20rpx;
.logo-box {
width: 130rpx;
height: 130rpx;
border-radius: 50%;
border: 1rpx solid #eee;
display: flex;
align-items: center;
justify-content: center;
margin-bottom: 40rpx;
.logo {
width: 120rpx;
height: 120rpx;
border-radius: 50%;
}
}
.app-name {
font-size: 36rpx;
color: #333;
font-weight: 500;
}
}
}
</style>
subPackages/orders/detail.vue
......@@ -184,7 +184,7 @@
查看物流
</button>
<button plain v-if="['待收货', '拼团成功,待收货'].includes(orderState(order))"
@tap="confirm(order.orderNum) && order.deliveryNum">
@tap="handleConfirm(order.orderNum) && order.deliveryNum">
确认收货
</button>
<button type="primary" @tap="review(order.orderNum)" v-if="['待评价'].includes(orderState(order))">
......@@ -525,7 +525,29 @@
},
})
},
confirm(orderNum) {
// confirm(orderNum) {
// let self = this;
// uni.showModal({
// title: "提示",
// content: "确定确认收货么?",
// success: async ({
// confirm
// }) => {
// if (confirm) {
// let param = {
// merchant_id: self.order.merchantId,
// merchant_trade_no: self.order.merchantTradeNo,
// transaction_id: self.order.transactionId
// }
// self.$util.openBusinessView(param, () => {
// self.orderConfirm(orderNum)
// })
// }
// },
// });
// },
handleConfirm(orderNum) {
let self = this;
uni.showModal({
title: "提示",
......@@ -534,6 +556,8 @@
confirm
}) => {
if (confirm) {
if (self.order.merchantId && self.order.merchantTradeNo && self.order
.transactionId) {
let param = {
merchant_id: self.order.merchantId,
merchant_trade_no: self.order.merchantTradeNo,
......@@ -542,11 +566,16 @@
self.$util.openBusinessView(param, () => {
self.orderConfirm(orderNum)
})
} else {
self.orderConfirm(orderNum)
}
}
},
});
},
orderConfirm(orderNum) {
let self = this;
let data = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment