wangfukang 1 week ago
parent
commit
8fe3ae1032
  1. 4
      package4/ieBrowser/chat.vue
  2. 8
      package4/ieBrowser/dailyQuestion.vue
  3. 6
      package4/ieBrowser/index.vue
  4. 4
      package4/ieBrowser/match.vue
  5. 2
      package4/ieBrowser/matching.vue
  6. 2
      package4/ieBrowser/profileSetup.vue
  7. 2
      package4/ieBrowser/settings.vue
  8. 4
      package4/ieBrowser/universe.vue

4
package4/ieBrowser/chat.vue

@ -43,7 +43,7 @@
<view class="fish-goods-card" v-if="fishGoodsCard.id" @tap="goFishGoods"> <view class="fish-goods-card" v-if="fishGoodsCard.id" @tap="goFishGoods">
<image class="fish-goods-cover" v-if="fishGoodsCard.cover" :src="fishGoodsCard.cover" mode="aspectFill"></image> <image class="fish-goods-cover" v-if="fishGoodsCard.cover" :src="fishGoodsCard.cover" mode="aspectFill"></image>
<view class="fish-goods-main"> <view class="fish-goods-main">
<view class="fish-goods-label">正在咨询校园二手</view> <view class="fish-goods-label">正在咨询二手物品</view>
<view class="fish-goods-title">{{fishGoodsCard.title}}</view> <view class="fish-goods-title">{{fishGoodsCard.title}}</view>
</view> </view>
<view class="fish-goods-link">查看 </view> <view class="fish-goods-link">查看 </view>
@ -403,7 +403,7 @@
if (options.fishGoodsId) { if (options.fishGoodsId) {
this.fishGoodsCard = { this.fishGoodsCard = {
id: options.fishGoodsId, id: options.fishGoodsId,
title: decodeURIComponent(options.fishGoodsTitle || options.quote || '校园二手商品'), title: decodeURIComponent(options.fishGoodsTitle || options.quote || '二手商品'),
cover: decodeURIComponent(options.fishGoodsCover || '') cover: decodeURIComponent(options.fishGoodsCover || '')
} }
} }

8
package4/ieBrowser/dailyQuestion.vue

@ -8,7 +8,7 @@
</view> </view>
<view class="question-card" v-if="question.exists"> <view class="question-card" v-if="question.exists">
<view class="q-deco"> 今日全校同题 </view> <view class="q-deco"> 今日同题 </view>
<view class="q-text">{{ question.content }}</view> <view class="q-text">{{ question.content }}</view>
<view class="q-count">已有 {{ question.answerCount }} 人回答</view> <view class="q-count">已有 {{ question.answerCount }} 人回答</view>
</view> </view>
@ -37,7 +37,7 @@
<view class="card-user"> <view class="card-user">
<view class="card-name"> <view class="card-name">
{{ item.displayTitle }} {{ item.displayTitle }}
<text class="school-badge" v-if="item.sameSchool"></text> <text class="school-badge" v-if="item.sameSchool">区域</text>
<text class="mine-badge" v-if="item.mine"></text> <text class="mine-badge" v-if="item.mine"></text>
</view> </view>
<view class="card-mode">{{ item.displaySubTitle }}</view> <view class="card-mode">{{ item.displaySubTitle }}</view>
@ -168,7 +168,7 @@
normalizeAnswer(item) { normalizeAnswer(item) {
const mode = item && item.currentMode === 'e' ? 'e' : 'i' const mode = item && item.currentMode === 'e' ? 'e' : 'i'
const modeText = mode === 'e' ? '会主动递一句话' : '愿意慢慢听你说' const modeText = mode === 'e' ? '会主动递一句话' : '愿意慢慢听你说'
const scopeText = item && item.sameSchool ? '同校频率' : '此刻同频' const scopeText = item && item.sameSchool ? '区域频率' : '此刻同频'
return { return {
...item, ...item,
displayMode: mode, displayMode: mode,
@ -184,7 +184,7 @@
}, },
answerSubTitle(item) { answerSubTitle(item) {
const modeText = this.answerMode(item) === 'e' ? '会主动递一句话' : '愿意慢慢听你说' const modeText = this.answerMode(item) === 'e' ? '会主动递一句话' : '愿意慢慢听你说'
const scopeText = item && item.sameSchool ? '同校频率' : '此刻同频' const scopeText = item && item.sameSchool ? '区域频率' : '此刻同频'
return `${scopeText} · ${modeText}` return `${scopeText} · ${modeText}`
}, },
wait(ms) { wait(ms) {

6
package4/ieBrowser/index.vue

@ -364,8 +364,8 @@
moods: [{"key":"quiet","label":"想安静","icon":"🌙","copy":"对方没有催我讲话,沉默变得没那么尴尬。"},{"key":"talk","label":"想说话","icon":"💭","copy":"聊了一个很小的日常话题,心情被拉亮了一点。"},{"key":"listen","label":"听着呢","icon":"🎧","copy":"像有人坐在旁边,不需要解释为什么低落。"},{"key":"drift","label":"轻了一点","icon":"🫧","copy":"只是给今天留一点柔软的痕迹。"}], moods: [{"key":"quiet","label":"想安静","icon":"🌙","copy":"对方没有催我讲话,沉默变得没那么尴尬。"},{"key":"talk","label":"想说话","icon":"💭","copy":"聊了一个很小的日常话题,心情被拉亮了一点。"},{"key":"listen","label":"听着呢","icon":"🎧","copy":"像有人坐在旁边,不需要解释为什么低落。"},{"key":"drift","label":"轻了一点","icon":"🫧","copy":"只是给今天留一点柔软的痕迹。"}],
targetModes: [{ key: 'i', label: '匹配 i 人' }, { key: 'e', label: '匹配 e 人' }, { key: 'any', label: '都可以' }], targetModes: [{ key: 'i', label: '匹配 i 人' }, { key: 'e', label: '匹配 e 人' }, { key: 'any', label: '都可以' }],
targetGenders: [{ key: 'male', label: '男生' }, { key: 'female', label: '女生' }, { key: 'any', label: '不限' }], targetGenders: [{ key: 'male', label: '男生' }, { key: 'female', label: '女生' }, { key: 'any', label: '不限' }],
matchScopes: [{ key: 'school', label: '本区' }, { key: 'world', label: '世界用户' }], matchScopes: [{ key: 'school', label: '本区' }, { key: 'world', label: '世界用户' }],
companions: {"i":[{"name":"树荫下的风","avatar":"风","state":"在校园里发呆","quote":"可以安静待 15 分钟,不用急着找话题。"},{"name":"耳机里的云","avatar":"云","state":"刚从教室出来","quote":"今天只想慢慢说两句。"}],"e":[{"name":"便利店灯光","avatar":"光","state":"想聊点不重要的","quote":"要不要交换一句今天最荒唐的小事?"},{"name":"操场散步员","avatar":"跑","state":"刚从操场回来","quote":"我可以负责开场,你负责随便接。"}]}, companions: {"i":[{"name":"树荫下的风","avatar":"风","state":"在静静的发呆","quote":"可以安静待 15 分钟,不用急着找话题。"},{"name":"耳机里的云","avatar":"云","state":"刚从教室出来","quote":"今天只想慢慢说两句。"}],"e":[{"name":"便利店灯光","avatar":"光","state":"想聊点不重要的","quote":"要不要交换一句今天最荒唐的小事?"},{"name":"操场散步员","avatar":"跑","state":"刚从操场回来","quote":"我可以负责开场,你负责随便接。"}]},
matchedPerson: {}, matchedPerson: {},
currentMatch: null, currentMatch: null,
presetDriftMessages: [ presetDriftMessages: [
@ -758,7 +758,7 @@
} }
const areaInfo = this.getAreaInfo() const areaInfo = this.getAreaInfo()
if (this.matchScope === 'school' && !areaInfo.regionId) { if (this.matchScope === 'school' && !areaInfo.regionId) {
uni.showToast({ title: '请先选择区', icon: 'none' }) uni.showToast({ title: '请先选择区', icon: 'none' })
return return
} }
const verified = await this.ensureRealNameBeforeMatch() const verified = await this.ensureRealNameBeforeMatch()

4
package4/ieBrowser/match.vue

@ -29,7 +29,7 @@
</view> </view>
<view class="start" @tap="start">开始调频</view> <view class="start" @tap="start">开始调频</view>
<view class="tips">不展示真实头像距离和学校匹配成功后会保留聊天入口</view> <view class="tips">不展示真实头像距离和区域匹配成功后会保留聊天入口</view>
</view> </view>
</template> </template>
@ -94,7 +94,7 @@
} }
const areaInfo = this.getAreaInfo() const areaInfo = this.getAreaInfo()
if (this.matchScope === 'school' && !areaInfo.regionId) { if (this.matchScope === 'school' && !areaInfo.regionId) {
uni.showToast({ title: '请先选择区', icon: 'none' }) uni.showToast({ title: '请先选择区', icon: 'none' })
return return
} }
this.matching = true this.matching = true

2
package4/ieBrowser/matching.vue

@ -15,7 +15,7 @@
<view class="user-dot">{{ mode }}</view> <view class="user-dot">{{ mode }}</view>
<view class="other-dot"></view> <view class="other-dot"></view>
</view> </view>
<view class="title">校园电波正在接近</view> <view class="title">区域电波正在接近</view>
<view class="desc">{{ copyList[currentCopy] }}</view> <view class="desc">{{ copyList[currentCopy] }}</view>
<view class="skip" @tap="goCard">跳过动画</view> <view class="skip" @tap="goCard">跳过动画</view>
</view> </view>

2
package4/ieBrowser/profileSetup.vue

@ -364,7 +364,7 @@
try { try {
const areaInfo = this.getAreaInfo() const areaInfo = this.getAreaInfo()
if (!areaInfo.regionId) { if (!areaInfo.regionId) {
uni.showToast({ title: '请先选择区', icon: 'none' }) uni.showToast({ title: '请先选择区', icon: 'none' })
return return
} }
const profile = await saveIeProfile({ const profile = await saveIeProfile({

2
package4/ieBrowser/settings.vue

@ -39,7 +39,7 @@
<view class="status-badge" :class="'s' + (item.status || 0)">{{ statusText(item.status) }}</view> <view class="status-badge" :class="'s' + (item.status || 0)">{{ statusText(item.status) }}</view>
</view> </view>
<view class="desc">{{ item.reasonText || '已提交安全反馈。' }}</view> <view class="desc">{{ item.reasonText || '已提交安全反馈。' }}</view>
<view class="time">对象 {{ item.reportedUserId || '-' }} · {{ item.regionName || '未知区' }} · {{ item.createTime || '' }}</view> <view class="time">对象 {{ item.reportedUserId || '-' }} · {{ item.regionName || '未知区' }} · {{ item.createTime || '' }}</view>
<view class="handle" v-if="item.handleResult"> <view class="handle" v-if="item.handleResult">
<text>{{ item.handleResult }}</text> <text>{{ item.handleResult }}</text>
<text v-if="item.blockedIe === 1" class="blocked-tip">已限制对方 i/e 身份</text> <text v-if="item.blockedIe === 1" class="blocked-tip">已限制对方 i/e 身份</text>

4
package4/ieBrowser/universe.vue

@ -75,8 +75,8 @@
<view class="profile-edit-item region"> <view class="profile-edit-item region">
<view class="profile-edit-icon"></view> <view class="profile-edit-icon"></view>
<view> <view>
<view class="profile-edit-title">当前</view> <view class="profile-edit-title">当前区</view>
<view class="profile-edit-desc">{{ profile.regionName || '暂未选择区' }}</view> <view class="profile-edit-desc">{{ profile.regionName || '暂未选择区' }}</view>
</view> </view>
</view> </view>
</view> </view>

Loading…
Cancel
Save