bnyer
/
bnyer-cloud-tiktok
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

Merge branch 'master' of http://182.42.100.27:10113/bnyer/bnyer-cloud-tiktok into feature-1.1-dev

feature-1.1
Penny 3 years ago
parent
490805ea27 84b701ddf5
commit
45be20b84b
9 changed files with 141 additions and 94 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 148
      pages/ai/paint/paint.vue
  2. 7
      pages/creator/imgDetail.vue
  3. 4
      pages/index/index.vue
  4. 6
      pages/index/indexProto.vue
  5. 53
      pages/userInfo/userInfo.vue
  6. BIN
      static/paint-default.png
  7. BIN
      static/paint-selecte.png
  8. 6
      uni.scss
  9. 9
      utils/request.js

148
pages/ai/paint/paint.vue
View File

@ -3,6 +3,7 @@
<uni-forms :modelValue="formData" ref="form" validate-trigger='blur'>
<!-- 提示词 -->
<view class="head">
<view class="title">绘画提示词</view>
<view>
<uni-easyinput type="textarea" autoHeight v-model="formData.promptText" placeholder="请输入想生成画的提示词" class="promptInput" @blur="checkPrompt(formData.promptText)"></uni-easyinput>
</view>
@ -14,15 +15,12 @@
<view class="keywords">
<view class="head">
<view class="left">
<view class="icon">
<uni-icons type="fire-filled" size="20"></uni-icons>
</view>
<view class="title">提示词示例</view>
</view>
<view class="right" @click="getRandPrompt">
<view class="title">换一批</view>
<view class="icon">
<uni-icons type="refreshempty" size="20"></uni-icons>
<uni-icons type="refreshempty" size="14" :color="primaryColor"></uni-icons>
</view>
</view>
</view>
@ -36,9 +34,6 @@
<view class="style">
<view class="head">
<view class="left">
<view class="icon">
<uni-icons type="star-filled" size="20"></uni-icons>
</view>
<view class="title">选择创作风格</view>
</view>
</view>
@ -60,9 +55,6 @@
<view class="size">
<view class="head">
<view class="left">
<view class="icon">
<uni-icons type="map-filled" size="20"></uni-icons>
</view>
<view class="title">选择画布大小</view>
</view>
</view>
@ -90,6 +82,7 @@
export default {
data() {
return {
primaryColor: "#1a94bc",
formData:{
height: undefined,
width: undefined,
@ -396,31 +389,39 @@
}
</script>
<style lang="scss">
<style lang="scss" scoped>
.container {
padding: 0 10px;
}
.title {
font-size: 28rpx;
line-height: 48rpx;
}
.size {
width: 92%;
margin: 15rpx auto;
width: 100%;
.lists {
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: space-between;
justify-content: flex-start;
.item {
background-color: #fff;
background-color: $uni-white;
padding: 10rpx 20rpx;
border-radius: 10rpx;
color: #666;
border: 1rpx solid #666;
color: $uni-base-color;
border: 1rpx solid $uni-border-4;
margin-bottom: 10rpx;
font-size: 24rpx;
margin-right: 20rpx;
}
.active {
color: #060101;
border: 1rpx solid #F22E38;
background-color: #FFDEE0; //# FFDEE0
color: $uni-white;
border: 1rpx solid $uni-primary;
background-color: $uni-primary-60; //# FFDEE0
}
}
@ -428,16 +429,14 @@
display: flex;
flex-direction: row;
justify-content: space-between;
margin-bottom: 30rpx;
margin-bottom: 15rpx;
.left {
display: flex;
flex-direction: row;
align-items: center;
.title {
font-size: 28rpx;
}
}
.right {
@ -501,8 +500,7 @@
}
.style {
width: 92%;
margin: 15rpx auto;
width: 100%;
.lists {
display: flex;
@ -525,8 +523,6 @@
.active {
position: relative;
color: #F22E38;
}
}
@ -534,7 +530,7 @@
display: flex;
flex-direction: row;
justify-content: space-between;
margin-bottom: 30rpx;
margin-bottom: 20rpx;
.left {
display: flex;
@ -559,7 +555,7 @@
}
.keywords {
width: 92%;
width: 100%;
margin: 15rpx auto;
.lists {
@ -569,11 +565,11 @@
justify-content: space-between;
.item {
background-color: #fff;
background-color: $uni-white;
padding: 10rpx 15rpx;
border-radius: 10rpx;
color: #666;
border: 1rpx solid #666;
color: $uni-base-color;
border: 1rpx solid $uni-border-4;
max-width: 128rpx;
margin-bottom: 10rpx;
font-size: 24rpx;
@ -583,9 +579,9 @@
}
.active {
color: #060101;
border: 1rpx solid #F22E38;
background-color: #FFDEE0;
color: $uni-white;
border: 1rpx solid $uni-primary;
background-color: $uni-primary-50;
}
}
@ -613,16 +609,17 @@
.title {
margin-right: 15rpx;
font-size: 24rpx;
line-height: 48rpx;
color: $uni-primary;
}
.icon {
line-height: 48rpx;
}
}
}
}
page {
background-color: #fff;
padding-bottom: 120rpx;
}
.btn-action {
width: 90%;
position: fixed;
@ -678,7 +675,7 @@
.styleBox{
white-space: nowrap; // 滚动必须加的属性
width: 700rpx;
margin-left: 30rpx;
margin-right: 30rpx;
//padding-right: 20rpx;
.styleItem{
@ -688,18 +685,22 @@
display: inline-flex; // item的外层定义成行内元素才可进行滚动 inline-block / inline-flex 均可
flex-direction: column;
align-items: center;
border: 5rpx solid #fff;
border-radius: 10rpx;
overflow: hidden;
position: relative;
border: 5rpx solid #fff;
border-radius: 10rpx;
overflow: hidden;
position: relative;
}
.styleActive {
color: #060101;
border: 1rpx solid #F22E38;
background-color: #FFDEE0;
opacity: 0.9;
font-weight: 900;
color: $uni-primary;
border: 2rpx solid $uni-primary;
.styleName {
background-color: $uni-primary-60;
opacity: 0.9 !important;
color: $uni-white;
}
}
.styleCover{
@ -708,7 +709,7 @@
}
.styleName{
font-size: 36rpx;
font-size: 28rpx;
color: #000000;
line-height: 42rpx;
padding: 0;
@ -717,34 +718,43 @@
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
position: absolute;
background-color: #FFF;
opacity: 0.5;
top: 125rpx;
position: absolute;
background-color: #FFF;
opacity: 0.5;
bottom: 0;
}
}
.bottom {
width: calc(100% - 40rpx);
position: fixed;
bottom: 20rpx;
}
.startPaint{
background-color: #1A96DB;
border: 1px solid #F22E38;
border-radius: 10rpx;
}
width: 300rpx;
background-color: $uni-primary;
border: 1px solid $uni-primary;
border-radius: 40rpx;
color: $uni-white;
}
.startPaint::after {
border: 0!important;
}
.checkPromptText{
font-size: 30rpx;
color: #F22E38;
font-size: 24rpx;
color: $uni-primary;
margin-left: 36rpx;
}
.checkStyleBox{
font-size: 30rpx;
color: #F22E38;
margin-left: 36rpx;
font-size: 24rpx;
color: $uni-primary;
//margin-left: 36rpx;
}
.checkSize{
font-size: 30rpx;
color: #F22E38;
margin-left: 36rpx;
font-size: 24rpx;
color: $uni-primary;
//margin-left: 36rpx;
}
</style>

7
pages/creator/imgDetail.vue
View File

@ -335,6 +335,10 @@
key: 'userInfo',
data: res.data.data.userInfo,
})
uni.setStorage({
key: 'platform',
data: res.data.data.platform,
})
this.userInfo = res.data.data.userInfo;
console.log('this.userInfo',this.userInfo)
uni.setStorage({
@ -342,7 +346,8 @@
data: res.data.data.access_token
})
let headers = {
TiktokAuthorization: res.data.data.access_token
TiktokAuthorization: res.data.data.access_token,
platform: res.data.data.platform
}
this.checkUserDownload(headers)
callBack && callBack(headers)

4
pages/index/index.vue
View File

@ -264,6 +264,10 @@
key: 'userInfo',
data: res.data.data.userInfo,
})
uni.setStorage({
key: 'platform',
data: res.data.data.platform,
})
uni.setStorage({
key: 'token',
data: res.data.data.access_token

6
pages/index/indexProto.vue
View File

@ -66,7 +66,7 @@
noClick:true, //防止重复提交
banner:[
{
bannerImg: "/static/uni.png"
bannerImg: "/static/img/start.gif"
}
],
current: 0,
@ -308,7 +308,7 @@
.user-list {
display: flex;
justify-content: center;
justify-content: left;
align-items: center;
overflow-x: auto;
@ -327,6 +327,8 @@
text {
font-size: 24rpx;
text-align: center;
white-space: nowrap;
text-overflow: ellipsis;
}
}

53
pages/userInfo/userInfo.vue
View File

@ -27,22 +27,35 @@
</view>
</view> -->
</view>
<view class="share-box">
<button title="兑换绘画次数" @click="$noMultipleClicks(useCdk)">
<view class="list-menu-item">
<uni-icons class="list-menu-icon" custom-prefix="iconfont" type="icon-gengduo" size="20" :color="primaryColor" />
<view class="text">兑换绘画次数</view>
<uni-icons class="list-menu-genduo" custom-prefix="iconfont" type="icon-gengduo"></uni-icons>
</view>
</button>
</view>
<view class="list-menu">
<view class="list-menu-item" v-for="item in menus" @click="toLink(item.url)">
<uni-icons class="list-menu-icon" custom-prefix="iconfont" :type="item.icon" size="20" :color="primaryColor"></uni-icons>
<view class="text">{{item.title}}</view>
<view class="list-menu-item" @click="toLink(`/pages/userInfo/question/question`)">
<uni-icons class="list-menu-icon" custom-prefix="iconfont" type="icon-wenti-" size="20" :color="primaryColor"></uni-icons>
<view class="text">常见问题</view>
<uni-icons class="list-menu-genduo" custom-prefix="iconfont" type="icon-gengduo"></uni-icons>
</view>
<view class="list-menu-item" @click="$noMultipleClicks(linkToUs)">
<uni-icons class="list-menu-icon" custom-prefix="iconfont" type="icon-zhifeiji" size="20" :color="primaryColor" />
<view class="text">联系我们</view>
<uni-icons class="list-menu-genduo" custom-prefix="iconfont" type="icon-gengduo"></uni-icons>
</view>
<view class="list-menu-item" @click="toLink(`/pages/userInfo/setting/setting`)">
<uni-icons class="list-menu-icon" custom-prefix="iconfont" type="icon-chilun" size="20" :color="primaryColor"></uni-icons>
<view class="text">设置</view>
<uni-icons class="list-menu-genduo" custom-prefix="iconfont" type="icon-gengduo"></uni-icons>
</view>
</view>
<view class="share-box">
<button title="联系我们" @click="$noMultipleClicks(linkToUs)">
<view class="list-menu-item">
<uni-icons class="list-menu-icon" custom-prefix="iconfont" type="icon-zhifeiji" size="20" :color="primaryColor" />
<view class="text">联系我们</view>
<uni-icons class="list-menu-genduo" custom-prefix="iconfont" type="icon-gengduo"></uni-icons>
</view>
</button>
<view class="share-box">
<button title="分享" open-type="share">
<view class="list-menu-item">
<uni-icons class="list-menu-icon" custom-prefix="iconfont" type="icon-fenxiang1" size="20" :color="primaryColor" />
@ -50,17 +63,11 @@
<uni-icons class="list-menu-genduo" custom-prefix="iconfont" type="icon-gengduo"></uni-icons>
</view>
</button>
<button title="兑换绘画次数" @click="$noMultipleClicks(useCdk)">
<view class="list-menu-item">
<uni-icons class="list-menu-icon" custom-prefix="iconfont" type="icon-gengduo" size="20" :color="primaryColor" />
<view class="text">兑换绘画次数</view>
<uni-icons class="list-menu-genduo" custom-prefix="iconfont" type="icon-gengduo"></uni-icons>
</view>
</button>
</view>
</view>
</view>
</view>
</template>
<script>
@ -117,6 +124,12 @@ import UniIcons from "../../uni_modules/uni-icons/components/uni-icons/uni-icons
//设置数据供页面展示头像，名称等
this.userInfo = res.data.data.userInfo;
console.log('this.userInfo',this.userInfo)
//设置平台
uni.setStorage({
key: 'platform',
data: res.data.data.platform,
})
//设置token
uni.setStorage({
key: 'token',
data: res.data.data.access_token,

BIN
static/paint-default.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

BIN
static/paint-selecte.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 10 KiB

6
uni.scss
View File

@ -4,6 +4,12 @@ $uni-primary: #1a94bc;
$uni-primary-disable:mix(#fff,$uni-primary,50%);
$uni-primary-light: mix(#fff,$uni-primary,80%);
$uni-primary-80: rgba(26, 148 , 188, 0.8);
$uni-primary-60: rgba(26, 148 , 188, 0.6);
$uni-primary-50: rgba(26, 148 , 188, 0.5);
$uni-primary-40: rgba(26, 148 , 188, 0.4);
$uni-primary-20: rgba(26, 148 , 188, 0.2);
// 辅助色
// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
$uni-success: #18bc37;

9
utils/request.js
View File

@ -27,7 +27,10 @@ const loginFunc = (res, userInfo) => {
data: res.data.data.userInfo,
})
this.userInfo = res.data.data.userInfo;
uni.setStorageSync({
key: 'platform',
data: res.data.data.platform,
})
} else {
uni.showToast({
title: res.data.msg,
@ -129,6 +132,10 @@ service.interceptors.request.use(
if (token) {
config.headers["TiktokAuthorization"] = token;
}
const platform = uni.getStorageSync('platform');
if (platform) {
config.headers["platform"] = platform;
}
config.headers['Content-Type'] = 'application/json'
return config;
},

Write Preview
Loading…
Cancel
Save