Browse Source

Merge branch 'zhangrenyuan/feature-20250714163943-金币前端二期' into milestone-20250711-金币前端二期

zhangrenyuan/feature-20250714163943-金币前端二期
zry 3 weeks ago
parent
commit
7ce01541a0
  1. 4
      .env.development
  2. 1
      src/views/permissions/permission.vue
  3. 2
      src/views/refund/addCoinRefund.vue
  4. 2
      src/views/usergold/clientCountBalance.vue
  5. 2
      stats.html

4
.env.development

@ -1,7 +1,7 @@
# VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
# VITE_API_BASE='http://192.168.9.28:8081/' # VITE_API_BASE='http://192.168.9.28:8081/'
# 测试环境 # 测试环境
VITE_API_BASE='http://18.143.76.3:10704/'
# VITE_API_BASE='http://18.143.76.3:10704/'
# VITE_API_BASE='http://192.168.9.52:10705/' # VITE_API_BASE='http://192.168.9.52:10705/'
VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload

1
src/views/permissions/permission.vue

@ -883,7 +883,6 @@ const handleCheckChange = async (checkedNodes, checkedInfo) => {
} else { } else {
addRole.value.checkedKeys = checkedInfo.checkedKeys; addRole.value.checkedKeys = checkedInfo.checkedKeys;
console.log('else'); console.log('else');
} }
}; };

2
src/views/refund/addCoinRefund.vue

@ -227,7 +227,7 @@ const getUser = async function (jwcode) {
} }
user.value = processedData; user.value = processedData;
console.log("用户信息", user.value); console.log("用户信息", user.value);
ElMessage.success(result.msg);
//ElMessage.success(result.msg);
} }
} catch (error) { } catch (error) {
console.log("请求失败", error); console.log("请求失败", error);

2
src/views/usergold/clientCountBalance.vue

@ -394,7 +394,7 @@ const handleMarketChange = (val) => {
((scope.row.currentPermanentGold || 0 ) + ((scope.row.currentPermanentGold || 0 ) +
(scope.row.currentFreeJune|| 0 ) + (scope.row.currentFreeJune|| 0 ) +
(scope.row.currentFreeDecember|| 0 ) + (scope.row.currentFreeDecember|| 0 ) +
(scope.row.currentTaskGold || 0) / 100)
(scope.row.currentTaskGold || 0) ) /100
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>

2
stats.html
File diff suppressed because it is too large
View File

Loading…
Cancel
Save